diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-29 14:22:04 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-29 14:22:04 +0100 |
commit | 8e2d4c6da55d2a21492f8610d595046f07d9887e (patch) | |
tree | 85ca2f67dd9552a3884d76d7d645adfb88e179e4 /synapse/streams/config.py | |
parent | Create the correct events with the right configuration when creating a new room. (diff) | |
parent | Merge branch 'release-v0.1.0' into develop (diff) | |
download | synapse-8e2d4c6da55d2a21492f8610d595046f07d9887e.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
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) |