diff options
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 |
commit | 28ffda41e1400524747b3cb6c505fd172611aed8 (patch) | |
tree | ef35cab2be410cfa1c9d308ac68d12fc76a5bc67 /example_project/local_settings.py.sample | |
parent | 55bb5ec780fd03f671f6df6272e08227fc498f84 (diff) | |
parent | 46c97a2e19d5048c370342dc388bd457a861406a (diff) | |
download | Ishtar-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