diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-04 23:15:53 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-04 23:15:53 +0200 |
commit | 0986a6cdcc3c5a5145609d6f04100528a2893b5a (patch) | |
tree | c618209a6908e3bbfa686cf3fe6255e0e65c448b /settings.py | |
parent | d06361146b4f77c9b759272f9103c36732db8cc5 (diff) | |
parent | 6c01c66378169d4f2deefac15d415479768057ec (diff) | |
download | Chimère-0986a6cdcc3c5a5145609d6f04100528a2893b5a.tar.bz2 Chimère-0986a6cdcc3c5a5145609d6f04100528a2893b5a.zip |
Merge branch 'master' into v3.0
Diffstat (limited to 'settings.py')
0 files changed, 0 insertions, 0 deletions