Merge branch 'master' into pg-search38/head
commit3eeb3bfafca5fe31ddc145a065900d17487bf13f
authorStefan Kögl <stefan@skoegl.net>
Mon, 25 Sep 2017 19:07:16 +0000 (25 21:07 +0200)
committerStefan Kögl <stefan@skoegl.net>
Mon, 25 Sep 2017 19:07:16 +0000 (25 21:07 +0200)
tree143f790e98da798e2091f179cb80624643cd8021
parent4dabc36da21e0d529e22500f9abfce7067304fbf
parent7dab005b381e231df54c5b91e8ef815b6ed7b5cb
Merge branch 'master' into pg-search
mygpo/settings.py
requirements.txt