Merge branch 'master' into prod

This commit is contained in:
2018-09-27 09:14:37 -07:00

View File

@@ -14,7 +14,7 @@ olefile==0.44
packaging==16.8 packaging==16.8
Pillow==4.0.0 Pillow==4.0.0
progressbar2==3.12.0 progressbar2==3.12.0
psycopg2==2.6.2 psycopg2-binary==2.7.5
PyJWT==1.4.2 PyJWT==1.4.2
pyparsing==2.1.10 pyparsing==2.1.10
python-dateutil==2.6.0 python-dateutil==2.6.0