summaryrefslogtreecommitdiff
path: root/example_project/local_settings.py.sample
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-05-01 11:42:01 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-05-01 11:42:01 +0200
commit28ffda41e1400524747b3cb6c505fd172611aed8 (patch)
treeef35cab2be410cfa1c9d308ac68d12fc76a5bc67 /example_project/local_settings.py.sample
parent55bb5ec780fd03f671f6df6272e08227fc498f84 (diff)
parent46c97a2e19d5048c370342dc388bd457a861406a (diff)
downloadIshtar-28ffda41e1400524747b3cb6c505fd172611aed8.tar.bz2
Ishtar-28ffda41e1400524747b3cb6c505fd172611aed8.zip
Merge branch 'master' into develop
Conflicts: .gitlab-ci.yml
Diffstat (limited to 'example_project/local_settings.py.sample')
0 files changed, 0 insertions, 0 deletions