summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-02-12 13:20:06 +0000
committerGitHub <noreply@github.com>2019-02-12 13:20:06 +0000
commitba3f27b69abde42b7d7980c05461c4fb376b79cf (patch)
treefeddfc76d1854785b38929e80fe5bb5029a55e01 /synapse/handlers
parentFixup changelog entries (diff)
parentChangelog (diff)
downloadsynapse-ba3f27b69abde42b7d7980c05461c4fb376b79cf.tar.xz
Merge pull request #4608 from matrix-org/anoa/acls_room_upgrade
Transfer Server ACLs on room upgrade
Diffstat (limited to 'synapse/handlers')
-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 5e40e9ea46..f9af1f0046 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -284,6 +284,7 @@ class RoomCreationHandler(BaseHandler):
             (EventTypes.GuestAccess, ""),
             (EventTypes.RoomAvatar, ""),
             (EventTypes.Encryption, ""),
+            (EventTypes.ServerACL, ""),
         )
 
         old_room_state_ids = yield self.store.get_filtered_current_state_ids(