diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-24 19:30:37 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-24 19:30:37 +0100 |
| commit | 0e9d38a6ed4dce4c23e6dfc59869d9d652e6dcfa (patch) | |
| tree | bb897cb3054f188070b902c40375b0dbbefb343a /example_project/settings.py | |
| parent | f9cb0d2cc88fb022c1fb44c26c0696923277397a (diff) | |
| parent | 136d69ad974a2beb94abb0b669d88054371ef57b (diff) | |
| download | Ishtar-0e9d38a6ed4dce4c23e6dfc59869d9d652e6dcfa.tar.bz2 Ishtar-0e9d38a6ed4dce4c23e6dfc59869d9d652e6dcfa.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'example_project/settings.py')
0 files changed, 0 insertions, 0 deletions