Merge branch 'master' into static-media
commit578928d6ff8e25ed8f2e4a6b5529d68c6328adc5
authorStefan Kögl <stefan@skoegl.net>
Thu, 1 Feb 2018 14:10:34 +0000 (1 15:10 +0100)
committerStefan Kögl <stefan@skoegl.net>
Thu, 1 Feb 2018 14:10:34 +0000 (1 15:10 +0100)
tree2453972fdb2b0562dcebfd3656770db77499c62c
parent4e653674dd2301f6931ed3fb3b04ec77e9449772
parent09a97b186eae24101000818cf99f55fd33e725fd
Merge branch 'master' into static-media
mygpo/api/urls.py
mygpo/podcastlists/urls.py
mygpo/publisher/urls.py
mygpo/urls.py
mygpo/users/urls.py
mygpo/web/logo.py
mygpo/web/urls.py