summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-07-05 15:13:34 +0100
committerGitHub <noreply@github.com>2016-07-05 15:13:34 +0100
commitef535178ff30081fbf74ec4e8b016a023ee5077d (patch)
tree340037a5c0cca085ed5d15b703eaefef21b57c46 /synapse/api
parentMerge pull request #906 from matrix-org/markjh/faster_events_around (diff)
parentrequestToken update (diff)
downloadsynapse-ef535178ff30081fbf74ec4e8b016a023ee5077d.tar.xz
Merge pull request #904 from matrix-org/dbkr/register_email_no_untrusted_id_server
requestToken update
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/errors.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index b106fbed6d..b219b46a4b 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -42,8 +42,9 @@ class Codes(object):
     TOO_LARGE = "M_TOO_LARGE"
     EXCLUSIVE = "M_EXCLUSIVE"
     THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED"
-    THREEPID_IN_USE = "THREEPID_IN_USE"
+    THREEPID_IN_USE = "M_THREEPID_IN_USE"
     INVALID_USERNAME = "M_INVALID_USERNAME"
+    SERVER_NOT_TRUSTED = "M_SERVER_NOT_TRUSTED"
 
 
 class CodeMessageException(RuntimeError):