Merge branch 'master' into gitlab

This commit is contained in:
Joseph Schorr 2015-05-03 12:13:09 -04:00
commit e3aededcbc
70 changed files with 1000 additions and 265 deletions

View file

@ -53,11 +53,13 @@ raven==5.1.1
redis==2.10.3
reportlab==2.7
requests==2.5.1
requests-oauthlib==0.4.2
six==1.9.0
stringscore==0.1.0
stripe==1.20.1
trollius==1.0.4
tzlocal==1.1.2
urllib3==1.10.2
waitress==0.8.9
websocket-client==0.23.0
wsgiref==0.1.2