diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-02 13:39:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-02 13:39:22 +0000 |
| commit | 4195e55ccc0f5751b13136b8c5f60686a902b79d (patch) | |
| tree | d9e1596e1ecf6cfd6a3e7152a20748496a9e0890 /synapse/handlers/events.py | |
| parent | Use contextlib.contextmanager instead of a custom class (diff) | |
| parent | Merge pull request #95 from matrix-org/serialize_transaction_processing (diff) | |
| download | synapse-4195e55ccc0f5751b13136b8c5f60686a902b79d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_rate_limit
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) |