Merge branch 'master' into dinsic

1 files changed, 1 insertions, 0 deletions

diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index cdf24f5ebc..fd160de1d4 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -79,6 +79,7 @@ class EventTypes(object):
 
     RoomHistoryVisibility = "m.room.history_visibility"
     CanonicalAlias = "m.room.canonical_alias"
+    Encryption = "m.room.encryption"
     RoomAvatar = "m.room.avatar"
     RoomEncryption = "m.room.encryption"
     GuestAccess = "m.room.guest_access"