summary refs log tree commit diff
path: root/synapse/api/errors.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-23 11:31:53 +0000
committerErik Johnston <erik@matrix.org>2016-11-23 11:31:53 +0000
commitb69f76c1069ac4daa570102ab3dac0bf08e8dcc1 (patch)
treeb3b53d30e85bc26946c988ccc478f130b6f1c452 /synapse/api/errors.py
parentComment (diff)
parentMerge pull request #1640 from matrix-org/kegan/sync-perf (diff)
downloadsynapse-b69f76c1069ac4daa570102ab3dac0bf08e8dcc1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_fed_txn
Diffstat (limited to 'synapse/api/errors.py')
-rw-r--r--synapse/api/errors.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py

index 0041646858..921c457738 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py
@@ -39,6 +39,7 @@ class Codes(object): CAPTCHA_NEEDED = "M_CAPTCHA_NEEDED" CAPTCHA_INVALID = "M_CAPTCHA_INVALID" MISSING_PARAM = "M_MISSING_PARAM" + INVALID_PARAM = "M_INVALID_PARAM" TOO_LARGE = "M_TOO_LARGE" EXCLUSIVE = "M_EXCLUSIVE" THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED"