Merge branch 'master' into static-media
commitb593d68f15160ce1ab93571acd7378a8611af1d0
authorStefan Kögl <stefan@skoegl.net>
Sat, 28 Oct 2017 14:04:25 +0000 (28 16:04 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sat, 28 Oct 2017 14:04:25 +0000 (28 16:04 +0200)
treed3596a93f4d055e22a7c31a2437b7daddbe4d906
parent411c98925743c6361f43cb14b09817bfd5107db2
parentbb68c070ea2d26cd4662e7921f2d963d53235915
Merge branch 'master' into static-media
mygpo/data/feeddownloader.py
mygpo/settings.py