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

Merge branch 'master' into use_new_template_stats_endpoint

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

__init__.py

…

test_add_service_form.py

…

test_asset_fingerprinter.py

…

test_create_api_key_form.py

Talk about trial mode on API keys page

2016-08-10 17:04:22 +01:00

test_errorhandlers.py

…

test_errors_for_csv.py

Change order of errors for bad CSV files

2016-06-03 16:26:58 +01:00

test_permissions.py

…

test_two_factor_form.py

…

test_user.py

…

test_validators.py

Text message not Sms

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