summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-24 14:51:35 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-24 14:51:35 +0000
commitacaca1b4e97b062ab0f926794435b901b7a3fa4e (patch)
tree79c9381f3e82d0c4ded96485988adb6d9016a910 /synapse/handlers/room.py
parentFix missing synapse metrics import (diff)
parentisort (diff)
downloadsynapse-acaca1b4e97b062ab0f926794435b901b7a3fa4e.tar.xz
Merge branch 'anoa/room_dir_quick_fix' into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index 581e96c743..cb8c5f77dd 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -269,6 +269,7 @@ class RoomCreationHandler(BaseHandler): (EventTypes.RoomHistoryVisibility, ""), (EventTypes.GuestAccess, ""), (EventTypes.RoomAvatar, ""), + (EventTypes.Encryption, ""), ) old_room_state_ids = yield self.store.get_filtered_current_state_ids(