Merge branch 'master' into pg-search
commit4dabc36da21e0d529e22500f9abfce7067304fbf
authorStefan Kögl <stefan@skoegl.net>
Sat, 9 Sep 2017 10:39:01 +0000 (9 12:39 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sat, 9 Sep 2017 10:39:01 +0000 (9 12:39 +0200)
tree3b7bbd6f7cd8f675928e5dedecbb05a773e181ac
parent66ee03760370f6c5948feeb153ca5b9fb97b1ad0
parent3410fc1a5ab5123786bbed5bd2e0a184d8887720
Merge branch 'master' into pg-search
.travis.yml
mygpo/administration/views.py
mygpo/settings.py
requirements.txt