summary refs log tree commit diff
path: root/synapse/api/errors.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-01-15 16:27:29 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-01-15 16:27:29 +0000
commit5de1563997e62811f8c04033c0a86c12343c5e4a (patch)
treea280a81a343ec93900470c7f6ebf3280161ed7d2 /synapse/api/errors.py
parentMerge pull request #500 from matrix-org/daniel/cleanup (diff)
parentRequire unbanning before other membership changes (diff)
downloadsynapse-5de1563997e62811f8c04033c0a86c12343c5e4a.tar.xz
Merge pull request #501 from matrix-org/daniel/unban
Require unbanning before other membership changes
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 ce0fc53668..b106fbed6d 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -29,6 +29,7 @@ class Codes(object):
     USER_IN_USE = "M_USER_IN_USE"
     ROOM_IN_USE = "M_ROOM_IN_USE"
     BAD_PAGINATION = "M_BAD_PAGINATION"
+    BAD_STATE = "M_BAD_STATE"
     UNKNOWN = "M_UNKNOWN"
     NOT_FOUND = "M_NOT_FOUND"
     MISSING_TOKEN = "M_MISSING_TOKEN"