diff options
| author | David Baker <dbkr@matrix.org> | 2014-08-29 13:24:08 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-08-29 13:24:08 +0100 |
| commit | 3e6a19cf0938423b53b17b520bb6c59b9eb4dd06 (patch) | |
| tree | c36e5b3a253499d6f5b2d44aa954f993c96c5b95 /synapse/streams | |
| parent | Change call signalling messages to be their own types of room events rather t... (diff) | |
| parent | Show notifications only when the user is detected as idle (diff) | |
| download | synapse-3e6a19cf0938423b53b17b520bb6c59b9eb4dd06.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/streams')
| -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) |