Merge branch 'master' into prod
commit7c13862916fd617e0b687882d0227004f3e2c52b
authorStefan Kögl <stefan@skoegl.net>
Fri, 21 Jul 2017 14:22:27 +0000 (21 16:22 +0200)
committerStefan Kögl <stefan@skoegl.net>
Fri, 21 Jul 2017 14:22:27 +0000 (21 16:22 +0200)
tree5aba657dc5ed600cf0758d6edd1dccf5d4ff772a
parentea40aac8288bdea42a05ed48e0173b336e8bebb8
parentd26f4667fc59c5ccd1c896422c5857caa6124306
Merge branch 'master' into prod
mygpo/podcasts/admin.py
mygpo/settings.py