Merge branch 'master' into django-1.10
commit0b1280090f9f050de8ded69e16e00b3087843dbb
authorStefan Kögl <stefan@skoegl.net>
Sat, 22 Jul 2017 10:40:08 +0000 (22 12:40 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sat, 22 Jul 2017 10:40:08 +0000 (22 12:40 +0200)
treeea58402cce8ba98df82f832f646dc818b6ba7f8e
parente227e6b6abac2bdabaf76e245b966dc4cc24b5c3
parent1a0c9879c60f7ee4c5204f26de01030f84a02ed2
Merge branch 'master' into django-1.10
mygpo/settings.py