summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-11-04 17:31:01 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2015-11-04 17:31:01 +0000
commit4e62ffdb21c17817a56c1d864d1f8dc91131b8ef (patch)
tree21928f0803225e707532b477f581c6f4f1885ac9 /synapse/handlers/room.py
parentAllow guests to register and call /events?room_id= (diff)
parentMerge pull request #339 from matrix-org/daniel/removesomelies (diff)
downloadsynapse-4e62ffdb21c17817a56c1d864d1f8dc91131b8ef.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 36878a6c20..9184dcd048 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -827,7 +827,6 @@ class RoomEventSource(object):
                 user_id=user.to_string(),
                 from_key=from_key,
                 to_key=to_key,
-                room_id=None,
                 limit=limit,
             )