diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-24 10:35:49 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-24 10:35:49 +0100 |
| commit | eede182df75d0c0b6064af016a06c2758ae217d0 (patch) | |
| tree | 4d4eb13dd3ab020032394f8282c85f4e3c2782e8 /synapse/api/errors.py | |
| parent | Move the key related config parser into a separate file (diff) | |
| parent | Copyright notices (diff) | |
| download | synapse-eede182df75d0c0b6064af016a06c2758ae217d0.tar.xz | |
Merge branch 'develop' into key_distribution
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 eddd889778..72d2bd5b4c 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -35,8 +35,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" |