Martyn Inglis 9fbd410474 Merge branch 'master' into use_new_template_stats_endpoint ...

Conflicts:
	app/notify_client/template_statistics_api_client.py

2016-08-22 16:47:42 +01:00

..

views

Admin app now in line with new API response for template statistics

2016-08-22 13:14:35 +01:00

__init__.py

Make the tour interactive

2016-05-25 13:14:09 +01:00

forms.py

Text message not Sms

2016-08-22 13:30:03 +01:00

uploader.py

Make s3upload function return the UUID

2016-05-16 13:05:41 +01:00

validators.py

…