diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-05 15:06:12 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-05 15:06:12 +0100 |
commit | 3cbe2d1450a18ccbb0deccb1561c99548cfbb1bb (patch) | |
tree | cacfd44d18db9263030377d95868122625ad0ada /example_project/settings.py | |
parent | 1ec9e5bae266bb0faf7c0824fd1f3d7e1ca109cd (diff) | |
parent | 050e801e1096682b5e4efe1a990109eda582dce5 (diff) | |
download | Ishtar-3cbe2d1450a18ccbb0deccb1561c99548cfbb1bb.tar.bz2 Ishtar-3cbe2d1450a18ccbb0deccb1561c99548cfbb1bb.zip |
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'example_project/settings.py')
0 files changed, 0 insertions, 0 deletions