Merge remote-tracking branch 'upstream/master' into python-registry-v2

This commit is contained in:
Jake Moshenko 2015-09-04 16:32:01 -04:00
commit 210ed7cf02
148 changed files with 1829 additions and 445 deletions

View file

@ -58,7 +58,7 @@ pycparser==2.14
pycrypto==2.6.1
pygpgme==0.3
pyjwkest==1.0.3
PyJWT==1.3.0
PyJWT==1.4.0
PyMySQL==0.6.6
pyOpenSSL==0.15.1
PyPDF2==1.24
@ -74,6 +74,7 @@ redis==2.10.3
reportlab==2.7
requests==2.7.0
requests-oauthlib==0.5.0
rfc3987==1.3.4
simplejson==3.7.3
six==1.9.0
SQLAlchemy==1.0.6