Merge branch 'master' into pg-search
commit7fcce128e6a9c3b34afdffb04fdfa0dc31702037
authorStefan Kögl <stefan@skoegl.net>
Sun, 6 Aug 2017 14:28:55 +0000 (6 16:28 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sun, 6 Aug 2017 14:28:55 +0000 (6 16:28 +0200)
treebbbeb0033e2a39d058e70a1747e9b986314ad600
parent759b270a891d26d6a801f76fb164d20f9d5d10f7
parentf74732814ce95cd052af3efbf8f4de7599752c7a
Merge branch 'master' into pg-search
mygpo/data/feeddownloader.py
mygpo/settings.py
requirements.txt