Merge branch 'master' into add-travis

pull/91/head
eshellman 2018-06-08 18:48:16 -04:00 committed by GitHub
commit f2edf98780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -89,12 +89,12 @@ xhtml2pdf==0.2.2
webencodings==0.5.1 webencodings==0.5.1
#for urllib3 secure #for urllib3 secure
cffi==1.7.0 cffi==1.7.0
cryptography==1.4 cryptography==2.2.2
enum34==1.1.6 enum34==1.1.6
idna==2.6 idna==2.6
ipaddress==1.0.16 ipaddress==1.0.16
ndg-httpsclient==0.4.2 ndg-httpsclient==0.4.2
pyOpenSSL==16.0.0 pyOpenSSL==18.0.0
pyasn1==0.1.9 pyasn1==0.1.9
pycparser==2.14 pycparser==2.14
setuptools==25.0.0 setuptools==25.0.0