diff options
| author | David Baker <dave@matrix.org> | 2015-04-24 09:37:54 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-04-24 09:37:54 +0100 |
| commit | 6532b6e60776f2c732b06e5535af068e9a049d6d (patch) | |
| tree | 4bbfeddf91f35c0f3744b346f30d6e3813c22196 /synapse/api/errors.py | |
| parent | Dedicated error code for failed 3pid auth verification (diff) | |
| parent | No commas here, otherwise our error string constants become tuples. (diff) | |
| download | synapse-6532b6e60776f2c732b06e5535af068e9a049d6d.tar.xz | |
Merge branch 'develop' into csauth
Conflicts: synapse/http/server.py
Diffstat (limited to 'synapse/api/errors.py')
| -rw-r--r-- | synapse/api/errors.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index e8b9ee533d..0b3320e62c 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -36,8 +36,8 @@ class Codes(object): LIMIT_EXCEEDED = "M_LIMIT_EXCEEDED" CAPTCHA_NEEDED = "M_CAPTCHA_NEEDED" CAPTCHA_INVALID = "M_CAPTCHA_INVALID" - MISSING_PARAM = "M_MISSING_PARAM", - TOO_LARGE = "M_TOO_LARGE", + MISSING_PARAM = "M_MISSING_PARAM" + TOO_LARGE = "M_TOO_LARGE" EXCLUSIVE = "M_EXCLUSIVE" THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED" |