Merge remote-tracking branch 'origin/2.2' into 2.2

This commit is contained in:
grossmj 2018-10-04 15:44:29 +02:00
commit de5a6ca8c7

View File

@ -1,6 +1,6 @@
-rrequirements.txt -rrequirements.txt
sphinx==1.7.1 sphinx==1.7.1
pytest==3.4.2 pytest==3.8.1
pep8==1.7.1 pep8==1.7.1
pytest-timeout==1.2.1 pytest-timeout==1.2.1