diff options
| author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
| commit | b37e8c9572ef90367bef9e70b66150fdfe243e5d (patch) | |
| tree | 1207a22a9529d48603317826926bc02866a474a0 /synapse/state/__init__.py | |
| parent | isort (diff) | |
| parent | Merge branch 'develop' into neilj/room_capabilities (diff) | |
| download | synapse-b37e8c9572ef90367bef9e70b66150fdfe243e5d.tar.xz | |
Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into neilj/room_capabilities
Diffstat (limited to 'synapse/state/__init__.py')
| -rw-r--r-- | synapse/state/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index e9ecb00277..68058f613c 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -608,10 +608,10 @@ 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.VDH_TEST, RoomVersions.STATE_V2_TEST, RoomVersions.V2, + RoomVersions.STATE_V2_TEST, RoomVersions.V2, RoomVersions.V3, ): return v2.resolve_events_with_store( - state_sets, event_map, state_res_store, + room_version, state_sets, event_map, state_res_store, ) else: # This should only happen if we added a version but forgot to add it to |