diff options
| author | Erik Johnston <erikj@jki.re> | 2018-11-01 13:17:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 13:17:57 +0000 |
| commit | 1b21e771d06d86e91c143cd7b180a3c6bd84774e (patch) | |
| tree | e0e4bbf68d8eb6c8fd0f888dc068dfb7d07203f4 /synapse/state | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-1b21e771d06d86e91c143cd7b180a3c6bd84774e.tar.xz | |
Merge pull request #4128 from matrix-org/erikj/state_res_v2_version
Add STATE_V2_TEST room version
Diffstat (limited to 'synapse/state')
| -rw-r--r-- | synapse/state/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index 9b40b18d5b..943d5d6bb5 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -607,7 +607,7 @@ 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 == RoomVersions.VDH_TEST: + elif room_version in (RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST): return v2.resolve_events_with_store( state_sets, event_map, state_res_store, ) |