diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
| commit | b63691f6e205b4e2d2a990ff04318e4daf731e2c (patch) | |
| tree | aa7a80d740c7ba8f7f5ce9fe28dc32c523746d53 /synapse/streams/events.py | |
| parent | Coturn's timestamps are in seconds, not milliseconds (diff) | |
| parent | Bump version numbers and change log (diff) | |
| download | synapse-b63691f6e205b4e2d2a990ff04318e4daf731e2c.tar.xz | |
Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2
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): |