Merge branch 'master' into celery458/head
commit914c70ee745166a8d28f625a50e46e3819250dbe
authorStefan Kögl <stefan@skoegl.net>
Sat, 9 Sep 2017 10:34:06 +0000 (9 12:34 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sat, 9 Sep 2017 14:28:49 +0000 (9 16:28 +0200)
treec7c895431e68d8df3499e05a1143da7d76697992
parent33229e22554aa2cc941ae922cf371a74f5e1ab4b
parent3410fc1a5ab5123786bbed5bd2e0a184d8887720
Merge branch 'master' into celery4
mygpo/settings.py
requirements.txt