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

This commit is contained in:
grossmj committed 2018-11-20 00:22:35 +07:00
commit e5950674f8
1 file changed
+2 -2
+2 -2
View File
@@ -1,6 +1,6 @@
-rrequirements.txt
sphinx==1.7.1
pytest==3.8.1
pytest==4.0.0
pep8==1.7.1
pytest-timeout==1.2.1
pytest-timeout==1.3.3