Merge branch 'develop' of github.com:matrix-org/synapse into develop

1 files changed, 1 insertions, 2 deletions

diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py

index 15d4c2bf68..c728013f4c 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -158,8 +158,7 @@ class StreamStore(SQLBaseStore):
         defer.returnValue(results)
 
     @log_function
-    def get_room_events_stream(self, user_id, from_key, to_key, room_id,
-                               limit=0):
+    def get_room_events_stream(self, user_id, from_key, to_key, limit=0):
         current_room_membership_sql = (
             "SELECT m.room_id FROM room_memberships as m "
             " INNER JOIN current_state_events as c"