]> git.parisson.com Git - diggersdigest.git/commitdiff
Merge branch 'master' of git.parisson.com:git/diggersdigest
authorThomas Fillon <thomas@parisson.com>
Tue, 29 Sep 2015 22:30:55 +0000 (00:30 +0200)
committerThomas Fillon <thomas@parisson.com>
Tue, 29 Sep 2015 22:30:55 +0000 (00:30 +0200)
1  2 
app/diggersdigest/settings.py

Simple merge