]> git.parisson.com Git - diggersdigest.git/commitdiff
Merge branch 'master' of git.parisson.com:git/diggersdigest
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 25 Sep 2015 13:38:26 +0000 (15:38 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 25 Sep 2015 13:38:26 +0000 (15:38 +0200)
1  2 
app/diggersdigest/settings.py

Simple merge