diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-31 18:11:00 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-31 18:11:00 +0000 |
| commit | bbb97a35fdaf7193e22ceacb8c155038b66651d2 (patch) | |
| tree | c166033c625605a56b3301dfdc74791f838a2a92 /synapse/api/constants.py | |
| parent | lint (diff) | |
| parent | Reject large transactions on federation (#4513) (diff) | |
| download | synapse-bbb97a35fdaf7193e22ceacb8c155038b66651d2.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrade_federatable
Diffstat (limited to 'synapse/api/constants.py')
| -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 0cbae9429b..f47c33a074 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -73,6 +73,7 @@ class EventTypes(object): RoomHistoryVisibility = "m.room.history_visibility" CanonicalAlias = "m.room.canonical_alias" RoomAvatar = "m.room.avatar" + RoomEncryption = "m.room.encryption" GuestAccess = "m.room.guest_access" # These are used for validation @@ -109,7 +110,7 @@ class RoomVersions(object): class RoomDisposition(object): - STABLE = "stable", + STABLE = "stable" UNSTABLE = "unstable" |