Merge branch 'master' into new-api-for-deleting-templates

Conflicts: app/main/views/templates.py
2026-09-09 13:49:50 -04:00 · 2016-08-24 11:05:19 +01:00
parent c44a6cb65d 8b99f484d4
commit 6e3759eb1f
5 changed files with 29 additions and 60 deletions
--- a/app/notify_client/service_api_client.py
+++ b/app/notify_client/service_api_client.py
@@ -89,6 +89,7 @@ class ServiceAPIClient(NotificationsAPIClient):
            'restricted',
            'email_from',
            'reply_to_email_address',
+            'research_mode',
            'sms_sender',
            'created_by',
            'branding',