Merge branch 'master' into update-code-of-conduct

This commit is contained in:
Mehdy Bohlool 2018-01-08 11:05:52 -08:00 committed by GitHub
commit 48c26c8bc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,6 +6,6 @@ urllib3>=1.19.1,!=1.21 # MIT
pyyaml>=3.12 # MIT
google-auth>=1.0.1 # Apache-2.0
ipaddress>=1.0.17 # PSF
websocket-client>=0.32.0,<=0.40.0 # LGPLv2+
websocket-client>=0.32.0,!=0.40.0,!=0.41.*,!=0.42.* # LGPLv2+
requests # Apache-2.0
requests-oauthlib # ISC