summary refs log tree commit diff
path: root/synapse/handlers/events.py
diff options
context:
space:
mode:
authorKegsay <kegsay@gmail.com>2015-03-02 12:02:48 +0000
committerKegsay <kegsay@gmail.com>2015-03-02 12:02:48 +0000
commit33f93d389ec5989f2e4ac75046e4df7df4590abc (patch)
tree8e4cc0565aaafe7b842b937f888f185dcab3a1e5 /synapse/handlers/events.py
parentSYWEB-278 Don't allow rules with no rule_id. (diff)
parentPEP8 (diff)
downloadsynapse-33f93d389ec5989f2e4ac75046e4df7df4590abc.tar.xz
Merge pull request #92 from matrix-org/application-services-event-stream
Application services event stream support
Diffstat (limited to 'synapse/handlers/events.py')
-rw-r--r--synapse/handlers/events.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 025e7e7e62..8d5f5c8499 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -69,9 +69,6 @@ class EventStreamHandler(BaseHandler):
                         )
                 self._streams_per_user[auth_user] += 1
 
-            if pagin_config.from_token is None:
-                pagin_config.from_token = None
-
             rm_handler = self.hs.get_handlers().room_member_handler
             room_ids = yield rm_handler.get_rooms_for_user(auth_user)