Merge branch 'master' into django2
commit5d023902af113ec1ddf84c6b23463fc2720c9353
authorStefan Kögl <stefan@skoegl.net>
Mon, 25 Sep 2017 19:28:47 +0000 (25 21:28 +0200)
committerStefan Kögl <stefan@skoegl.net>
Mon, 25 Sep 2017 19:28:47 +0000 (25 21:28 +0200)
tree21f24d504262e75b8054a3b631aae470493e661f
parent2b7a7f086adcc98900bf5cd364fe86e3c7b47878
parent480bf5721e7d2618d270e29eea6b634467ee5338
Merge branch 'master' into django2
requirements.txt