Merge branch 'master' into static-media
commit411c98925743c6361f43cb14b09817bfd5107db2
authorStefan Kögl <stefan@skoegl.net>
Mon, 25 Sep 2017 19:35:29 +0000 (25 21:35 +0200)
committerStefan Kögl <stefan@skoegl.net>
Mon, 25 Sep 2017 19:35:29 +0000 (25 21:35 +0200)
tree0af2f06fa3235a23ed9b6fefb363a2c989028f2d
parentd006aca0ccc2c33fb8522f4a2a19e2858f8c22bc
parent480bf5721e7d2618d270e29eea6b634467ee5338
Merge branch 'master' into static-media
makefile
mygpo/data/feeddownloader.py
mygpo/settings.py
requirements-test.txt