diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-21 14:04:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-21 14:04:19 +0000 |
| commit | 35e1d67b4e9c2c8b0abf35d41c2d9c56d486f6e3 (patch) | |
| tree | 2c844b79665fc32b0bfc49285586394edf367131 /synapse/api | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis (diff) | |
| download | synapse-35e1d67b4e9c2c8b0abf35d41c2d9c56d486f6e3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_invite_server
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/constants.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 87bc1cb53d..46c4b4b9dc 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -68,6 +68,7 @@ class EventTypes(object): Aliases = "m.room.aliases" Redaction = "m.room.redaction" ThirdPartyInvite = "m.room.third_party_invite" + Encryption = "m.room.encryption" RoomHistoryVisibility = "m.room.history_visibility" CanonicalAlias = "m.room.canonical_alias" @@ -128,4 +129,4 @@ class UserTypes(object): 'admin' and 'guest' users should also be UserTypes. Normal users are type None """ SUPPORT = "support" - ALL_USER_TYPES = (SUPPORT) + ALL_USER_TYPES = (SUPPORT,) |