diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:25:40 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:25:40 +0100 |
| commit | e8cf77fa496de10246735fa8a11020663285bdd2 (patch) | |
| tree | 7dfcf1f24dd965c8d34331fc70d1b17fbb6f03ad /synapse/api/errors.py | |
| parent | /tokenrefresh POST endpoint (diff) | |
| parent | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-e8cf77fa496de10246735fa8a11020663285bdd2.tar.xz | |
Merge branch 'develop' into refresh
Conflicts: synapse/rest/client/v1/login.py
Diffstat (limited to 'synapse/api/errors.py')
| -rw-r--r-- | synapse/api/errors.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index 0b3320e62c..c3b4d971a8 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -40,6 +40,7 @@ class Codes(object): TOO_LARGE = "M_TOO_LARGE" EXCLUSIVE = "M_EXCLUSIVE" THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED" + THREEPID_IN_USE = "THREEPID_IN_USE" class CodeMessageException(RuntimeError): |