summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-04-02 18:25:45 +0100
committerErik Johnston <erik@matrix.org>2019-04-02 18:25:45 +0100
commit613b443ff006c464b9d9fe839c912661b51c4940 (patch)
tree9efde7a05c9a1a1f2517ef4789d54e27a322865a /synapse/handlers
parentRemove spurious changelog files from hotfixes (diff)
parentMerge pull request #4991 from matrix-org/erikj/stagger_push_startup (diff)
downloadsynapse-613b443ff006c464b9d9fe839c912661b51c4940.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
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 c3dcfec247..17628e2684 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -280,6 +280,7 @@ class RoomCreationHandler(BaseHandler): (EventTypes.RoomAvatar, ""), (EventTypes.Encryption, ""), (EventTypes.ServerACL, ""), + (EventTypes.RelatedGroups, ""), ) old_room_state_ids = yield self.store.get_filtered_current_state_ids(