Merge branch 'master' into django-1.11
commit0139252421e6f7e22a70db2645cfcf6f3f1d4746
authorStefan Kögl <stefan@skoegl.net>
Sun, 6 Aug 2017 13:14:05 +0000 (6 15:14 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sun, 6 Aug 2017 13:14:05 +0000 (6 15:14 +0200)
treec7beefa6ae9fc135c7f2daae5c19ef338965d965
parent75ffe9e61917a031cfc62df14139e3e4bf129440
parentf2a425e74f812dd64349392342832cd7cc73ec31
Merge branch 'master' into django-1.11