diff options
| author | David Baker <dave@matrix.org> | 2015-03-04 14:56:41 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-03-04 14:56:41 +0000 |
| commit | 92b3dc3219ccabc6997c66197a3b879dc49f5597 (patch) | |
| tree | 083acae90fadadf500918d58754a628feff86351 /synapse/handlers/events.py | |
| parent | Use if not results rather than len, as per feedback. (diff) | |
| parent | Fix upgrade instructions (diff) | |
| download | synapse-92b3dc3219ccabc6997c66197a3b879dc49f5597.tar.xz | |
Merge branch 'develop' into pushrules2
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 3 |
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) |