diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
| commit | ef9c4476a0eb653637040f86dd900252cad30567 (patch) | |
| tree | ad14ecbbb2a03ceb47f8fba558994edd3d71b9df /synapse/streams/events.py | |
| parent | Fix SQL so that accepts we may want to persist events twice. (diff) | |
| parent | SYWEB-12: Add a 'Room Info' button which displays all state content. (diff) | |
| download | synapse-ef9c4476a0eb653637040f86dd900252cad30567.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Diffstat (limited to 'synapse/streams/events.py')
| -rw-r--r-- | synapse/streams/events.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py index 41715436b0..fb698d2d71 100644 --- a/synapse/streams/events.py +++ b/synapse/streams/events.py @@ -35,7 +35,7 @@ class NullSource(object): return defer.succeed(0) def get_pagination_rows(self, user, pagination_config, key): - return defer.succeed(([], pagination_config.from_token)) + return defer.succeed(([], pagination_config.from_key)) class EventSources(object): |