diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-29 12:10:00 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-29 12:10:00 +0100 |
commit | 47fb286184dd27d8098af2fd24d22dd82205d3d5 (patch) | |
tree | 3e186226e18131b7c5d9ca89fdb4075667110c6d /synapse/streams/config.py | |
parent | Expand architecture section to introduce room IDs, room aliases, user IDs, ev... (diff) | |
parent | Fix a couple of bugs in presence handler related to pushing updatesto the cor... (diff) | |
download | synapse-47fb286184dd27d8098af2fd24d22dd82205d3d5.tar.xz |
Merge branch 'presence_logging' into develop
Diffstat (limited to 'synapse/streams/config.py')
-rw-r--r-- | synapse/streams/config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/streams/config.py b/synapse/streams/config.py index 2434844d80..01bab568ff 100644 --- a/synapse/streams/config.py +++ b/synapse/streams/config.py @@ -81,4 +81,4 @@ class PaginationConfig(object): return ( "<PaginationConfig from_tok=%s, to_tok=%s, " "direction=%s, limit=%s>" - ) % (self.from_tok, self.to_tok, self.direction, self.limit) + ) % (self.from_token, self.to_token, self.direction, self.limit) |