diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-03 16:08:48 +0000 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-03 16:08:48 +0000 |
commit | 8a0407c7e6b43a9e36dfaed228442cc8fb1361bd (patch) | |
tree | 82e7a8610cb4f15094b23d6e3e0467f512390d04 /synapse/storage/state.py | |
parent | Surely we don't need to preserve 'events_default' twice (diff) | |
parent | Merge pull request #338 from matrix-org/daniel/fixdb (diff) | |
download | synapse-8a0407c7e6b43a9e36dfaed228442cc8fb1361bd.tar.xz |
Merge branch 'develop' into paul/tiny-fixes
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r-- | synapse/storage/state.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py index 6f2a50d585..acfb322a53 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -214,7 +214,6 @@ class StateStore(SQLBaseStore): that are in the `types` list. Args: - room_id (str) event_ids (list) types (list): List of (type, state_key) tuples which are used to filter the state fetched. `state_key` may be None, which matches |