Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Romain Dorgueil
2018-07-28 16:00:45 +01:00
12 changed files with 143 additions and 39 deletions

View File

@ -26,7 +26,7 @@ py==1.5.4
pygments==2.2.0
pyparsing==2.2.0
pytest-cov==2.5.1
pytest-timeout==1.3.0
pytest-timeout==1.3.1
pytest==3.6.3
python-dateutil==2.7.3
pytz==2018.5