Merge branch 'master' into markdown

This commit is contained in:
Tom Price
2016-07-13 23:39:42 +01:00
43 changed files with 2631 additions and 391 deletions

View File

@@ -22,7 +22,7 @@ python-dateutil==2.4.2
pytz==2015.4
raven==5.8.1
reportlab==3.1.44
selenium==2.53.1
selenium==2.53.6
simplejson==3.7.2
six==1.9.0
sqlparse==0.1.15