Merge branch '2.2' into pyup-update-pytest-3.2.5-to-3.3.2

This commit is contained in:
ziajka 2018-01-30 09:00:08 +01:00 committed by GitHub
commit 29b9b0431c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,6 +2,6 @@
sphinx==1.6.6
pytest==3.3.2
pep8==1.7.0
pep8==1.7.1
pytest-catchlog==1.2.2
pytest-timeout==1.2.0
pytest-timeout==1.2.1