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

This commit is contained in:
grossmj 2019-05-18 13:45:57 +07:00
commit f1ae3b3778

View File

@ -1,6 +1,6 @@
-rrequirements.txt -rrequirements.txt
sphinx==1.8.3 sphinx==1.8.3
pytest==4.4.0 pytest==4.4.1
pep8==1.7.1 pep8==1.7.1
pytest-timeout==1.3.3 pytest-timeout==1.3.3