summaryrefslogtreecommitdiff
path: root/papillon/settings.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-03-25 16:52:00 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-03-25 16:52:00 +0100
commite3c65fd09d849225f2173a310cbbce39c08fd71b (patch)
tree50e8df03a421c54a8aee47cdf1caea303e13c0c5 /papillon/settings.py
parent3431005b5268d5166d8693bd9e58c8dafaf5be3c (diff)
parentdbf0a5632319733d8fbdbdff2fb85f5026a02c7a (diff)
downloadPapillon-e3c65fd09d849225f2173a310cbbce39c08fd71b.tar.bz2
Papillon-e3c65fd09d849225f2173a310cbbce39c08fd71b.zip
Merge branch 'django-1.5' of https://github.com/Trim/papillon into v0.5
Diffstat (limited to 'papillon/settings.py')
0 files changed, 0 insertions, 0 deletions