diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 |
commit | 507d9eb44c328e13ffff26e4301d7e80bfc91f4d (patch) | |
tree | b497011ebb4ea4b899eb3c5ebeae6af15c2816c4 /example_project/settings.py | |
parent | 7522e7a325fb8ebad5f20bbfb5253b4be24e2cd0 (diff) | |
parent | 4509e950fbe35e6f529c4469dfc7802686fce28e (diff) | |
download | Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.tar.bz2 Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.zip |
Merge branch 'master' into v0.9
Diffstat (limited to 'example_project/settings.py')
0 files changed, 0 insertions, 0 deletions