Merge branch 'develop' into markjh/v2_sync_typing

Conflicts:
	synapse/handlers/sync.py

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