Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle 2017-01-19 11:04:56 +01:00
commit 6177a45eb5
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8

View File

@ -2,6 +2,7 @@ jsonschema>=2.4.0
aiohttp>=1.2.0 aiohttp>=1.2.0
aiohttp_cors>=0.4.0 aiohttp_cors>=0.4.0
yarl>=0.8.1 yarl>=0.8.1
typing>=3.5.3.0 # Otherwise yarl fail with python 3.4
Jinja2>=2.7.3 Jinja2>=2.7.3
raven>=5.23.0 raven>=5.23.0
psutil>=3.0.0 psutil>=3.0.0