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

pull/1421/head
grossmj 6 years ago
commit de5a6ca8c7

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

Loading…
Cancel
Save