Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Stephan Huber 2019-08-30 14:39:29 +02:00
commit 5a9c921d97
132 changed files with 33915 additions and 9581 deletions

View file

@ -1,5 +1,5 @@
[tox]
envlist = py27, py36
envlist = py27, py36, py37
[testenv]
setenv =