summary refs log tree commit diff
path: root/synapse/state/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-12-24 10:48:59 +0100
committerGitHub <noreply@github.com>2018-12-24 10:48:59 +0100
commitcd018e3543649b180118e934b80c47310183400e (patch)
tree0b9acff59fac00042c0982eecc6fda363627cd69 /synapse/state/__init__.py
parentReturn well_known in /login response (#4319) (diff)
parentNewsfile (diff)
downloadsynapse-cd018e3543649b180118e934b80c47310183400e.tar.xz
Merge pull request #4307 from matrix-org/erikj/v2_rooms
Add v2 room version
Diffstat (limited to 'synapse/state/__init__.py')
-rw-r--r--synapse/state/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py
index 70048b0c09..e9ecb00277 100644
--- a/synapse/state/__init__.py
+++ b/synapse/state/__init__.py
@@ -607,7 +607,9 @@ def resolve_events_with_store(room_version, state_sets, event_map, state_res_sto
         return v1.resolve_events_with_store(
             state_sets, event_map, state_res_store.get_events,
         )
-    elif room_version in (RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST):
+    elif room_version in (
+        RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST, RoomVersions.V2,
+    ):
         return v2.resolve_events_with_store(
             state_sets, event_map, state_res_store,
         )