diff options
| author | David Baker <dave@matrix.org> | 2018-07-17 15:43:33 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-07-17 15:43:33 +0100 |
| commit | 1d11d9323d1d5eb419cbced9417f58d155c68255 (patch) | |
| tree | 7b35de324a19d67f7fab5e6bc9c637c9c2253a71 /synapse/api/constants.py | |
| parent | Merge pull request #3502 from matrix-org/matthew/dinsic-tweak-display-names (diff) | |
| parent | changelog (diff) | |
| download | synapse-1d11d9323d1d5eb419cbced9417f58d155c68255.tar.xz | |
Merge remote-tracking branch 'origin/master' into dinsic
Diffstat (limited to 'synapse/api/constants.py')
| -rw-r--r-- | synapse/api/constants.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 92b5790557..00aa622b34 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -78,6 +78,8 @@ class EventTypes(object): Topic = "m.room.topic" Name = "m.room.name" + ServerACL = "m.room.server_acl" + class RejectedReason(object): AUTH_ERROR = "auth_error" |