summary refs log tree commit diff
path: root/synapse/state
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-01-29 23:53:14 +0000
committerGitHub <noreply@github.com>2019-01-29 23:53:14 +0000
commit47d03a79fc03e1cea1ee5b2c6906b64dc8b7baf2 (patch)
treeb6ebd2855bfa7e7f1f5c80e8bd560b270a829968 /synapse/state
parentMerge pull request #4499 from matrix-org/erikj/redactions_eiah (diff)
parentNo vdh tests! (diff)
downloadsynapse-47d03a79fc03e1cea1ee5b2c6906b64dc8b7baf2.tar.xz
Merge pull request #4515 from matrix-org/erikj/room_version_v3
Enable support for room version 3
Diffstat (limited to 'synapse/state')
-rw-r--r--synapse/state/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py
index 125635b01a..68058f613c 100644
--- a/synapse/state/__init__.py
+++ b/synapse/state/__init__.py
@@ -608,7 +608,7 @@ def resolve_events_with_store(room_version, state_sets, event_map, state_res_sto
             state_sets, event_map, state_res_store.get_events,
         )
     elif room_version in (
-        RoomVersions.STATE_V2_TEST, RoomVersions.V2,
+        RoomVersions.STATE_V2_TEST, RoomVersions.V2, RoomVersions.V3,
     ):
         return v2.resolve_events_with_store(
             room_version, state_sets, event_map, state_res_store,