Merge branch 'master' into django2
commit690693281ab4c157ea49e095293365960bdec430
authorStefan Kögl <stefan@skoegl.net>
Sat, 27 Jan 2018 10:45:55 +0000 (27 11:45 +0100)
committerStefan Kögl <stefan@skoegl.net>
Sat, 27 Jan 2018 10:45:55 +0000 (27 11:45 +0100)
tree7072f12a0f1ad140977733a9aa282e54f77c7cdd
parent3aa783dd71a4d068edfe37e6f3507c8897546ff7
parent25a23e66bf56be45dc919803649a84a1965bbc22
Merge branch 'master' into django2
requirements.txt