Merge branch 'django-1.10' of github.com:gpodder/mygpo
commit4f48903f839bf255e820e0a0e01c0102ae33148f
authorStefan Kögl <stefan@skoegl.net>
Mon, 24 Jul 2017 13:50:44 +0000 (24 13:50 +0000)
committerStefan Kögl <stefan@skoegl.net>
Mon, 24 Jul 2017 13:50:44 +0000 (24 13:50 +0000)
tree0f60b2af7973be2edeaf0ffd392328baf1d457cf
parent0d9acd4650865fe0be0d0d1e286bc1a7f2fcce83
parent75f984aa2a638f1c391151afcafb388d3377a9d6
Merge branch 'django-1.10' of github.com:gpodder/mygpo
mygpo/settings.py