summary refs log tree commit diff
path: root/synapse/state
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-12-18 18:10:37 +0000
committerErik Johnston <erik@matrix.org>2018-12-18 18:10:37 +0000
commitdf89f8afb87cb5302c6d68ca54d56969a9736133 (patch)
tree383a6b816aa522399505481bc6fa421b8aed40d2 /synapse/state
parentMerge tag 'v0.33.9' (diff)
downloadsynapse-df89f8afb87cb5302c6d68ca54d56969a9736133.tar.xz
Add v2 room version
Diffstat (limited to 'synapse/state')
-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,
         )