Merge branch 'master' into feature/online-auth

# Conflicts:
#	RIGS/test_functional.py
This commit is contained in:
David Taylor
2017-05-18 17:49:54 +01:00
6 changed files with 228 additions and 65 deletions

View File

@@ -24,7 +24,7 @@ python-dateutil==2.6.0
pytz==2017.2
raven==6.0.0
reportlab==3.4.0
selenium==2.53.1
selenium==3.4.1
simplejson==3.10.0
six==1.10.0
sqlparse==0.2.3