diff options
| author | Erik Johnston <erik@matrix.org> | 2016-07-06 14:46:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-07-06 14:46:31 +0100 |
| commit | a17e7caeb708f267e8ac2b18404a098e90792834 (patch) | |
| tree | 2dee0e30691c1a9fd30ee9d674c8c5a6cfe7e7de /synapse/api | |
| parent | Add ReadWriteLock for pagination and history prune (diff) | |
| parent | Check that there are no null bytes in user and passsword (diff) | |
| download | synapse-a17e7caeb708f267e8ac2b18404a098e90792834.tar.xz | |
Merge branch 'erikj/shared_secret' into erikj/test2
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/errors.py | 3 |
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): |