diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-30 17:26:44 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-30 17:26:44 +0200 |
commit | ffd57727a66952e12b5236e7567f5fd75eb7e5f8 (patch) | |
tree | 2b8ab152e92a95948e9a038ebcef815bfd56aa38 /example_project/manage.py | |
parent | 2a0842c8ffb0e7eec6b350f9d170670c8376cce8 (diff) | |
parent | 18995ac80a961083ad986f4abe984fd649ec40e2 (diff) | |
download | Ishtar-ffd57727a66952e12b5236e7567f5fd75eb7e5f8.tar.bz2 Ishtar-ffd57727a66952e12b5236e7567f5fd75eb7e5f8.zip |
Merge branch 'master' into develop
Diffstat (limited to 'example_project/manage.py')
0 files changed, 0 insertions, 0 deletions