diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-21 15:48:34 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-21 15:48:34 +0100 |
| commit | 5201c661082cb66e544c968ab3d5d97278509774 (patch) | |
| tree | 1a23e19f9be1c6139fbff4052b416261d6aadcd6 /synapse/storage/state.py | |
| parent | Doc string for the SyncHandler.typing_by_room method (diff) | |
| parent | Merge pull request #316 from matrix-org/markjh/v2_sync_archived (diff) | |
| download | synapse-5201c661082cb66e544c968ab3d5d97278509774.tar.xz | |
Merge branch 'develop' into markjh/v2_sync_typing
Conflicts: synapse/handlers/sync.py
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 |