diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
| commit | 3ad359e5becf7834fad3034a8d18f61206ede8f1 (patch) | |
| tree | 741c28822a3b5e26d229be68bc06c95a25218748 /synapse/state/v1.py | |
| parent | Allow backslashes in event field filters (diff) | |
| parent | Merge pull request #4082 from matrix-org/rav/fix_pep8 (diff) | |
| download | synapse-3ad359e5becf7834fad3034a8d18f61206ede8f1.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_validation
Diffstat (limited to 'synapse/state/v1.py')
| -rw-r--r-- | synapse/state/v1.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index 7a7157b352..70a981f4a2 100644 --- a/synapse/state/v1.py +++ b/synapse/state/v1.py @@ -31,7 +31,7 @@ POWER_KEY = (EventTypes.PowerLevels, "") @defer.inlineCallbacks -def resolve_events_with_factory(state_sets, event_map, state_map_factory): +def resolve_events_with_store(state_sets, event_map, state_map_factory): """ Args: state_sets(list): List of dicts of (type, state_key) -> event_id, |