Merge branch 'master' into pg-search
commitdcfa1564a4fae3590cd09712372dc8241e969c2a
authorStefan Kögl <stefan@skoegl.net>
Fri, 21 Jul 2017 18:50:52 +0000 (21 20:50 +0200)
committerStefan Kögl <stefan@skoegl.net>
Fri, 21 Jul 2017 18:50:52 +0000 (21 20:50 +0200)
tree2ecd5b17e5d099872460f1d13181a56fc0e2254f
parent3657fce47ae7d9f6ff0b2e21b8460ea95cd5d86c
parent1a0c9879c60f7ee4c5204f26de01030f84a02ed2
Merge branch 'master' into pg-search
mygpo/settings.py