Merge branch 'master' into use_new_template_stats_endpoint

Conflicts:
	app/notify_client/template_statistics_api_client.py
This commit is contained in:
Martyn Inglis
2016-08-22 16:47:42 +01:00
9 changed files with 16 additions and 11 deletions

View File

@@ -337,7 +337,7 @@ class ServiceSmsSender(Form):
def validate_sms_sender(form, field):
import re
if field.data and not re.match('^[a-zA-Z0-9\s]+$', field.data):
raise ValidationError('Sms text message sender can only contain alpha-numeric characters')
raise ValidationError('Text message sender can only contain alpha-numeric characters')
class ServiceBrandingOrg(Form):