diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-30 15:57:38 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-30 15:57:38 +0100 |
commit | c1e94dc1b8851b61bc8d697e08f8a407b5269365 (patch) | |
tree | 7d05ced66e557804795fb8e1a3540252bfd426d8 /example_project/settings.py | |
parent | 4a6c5fa994e583ba057eb78e398c626c41144636 (diff) | |
parent | 2623764591c43c79b48e08b5e13ab3c01a9a83a0 (diff) | |
download | Ishtar-c1e94dc1b8851b61bc8d697e08f8a407b5269365.tar.bz2 Ishtar-c1e94dc1b8851b61bc8d697e08f8a407b5269365.zip |
Merge branch 'master' into v0.9
Diffstat (limited to 'example_project/settings.py')
0 files changed, 0 insertions, 0 deletions