diff options
| author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-14 08:56:24 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-14 08:56:24 +0100 |
| commit | 703f9ff3c9e757caf4c17b2d34dd500f1ad99dd6 (patch) | |
| tree | c1505d3d2e4dbce686e5617032db2df87182824a /synapse/handlers/account_data.py | |
| parent | Newsfile (diff) | |
| parent | 1.3.0rc1 (diff) | |
| download | synapse-703f9ff3c9e757caf4c17b2d34dd500f1ad99dd6.tar.xz | |
Merge branch 'develop' into rei/room_stats_separated
Diffstat (limited to 'synapse/handlers/account_data.py')
| -rw-r--r-- | synapse/handlers/account_data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/account_data.py b/synapse/handlers/account_data.py index e62e6cab77..8acd9f9a83 100644 --- a/synapse/handlers/account_data.py +++ b/synapse/handlers/account_data.py @@ -51,8 +51,8 @@ class AccountDataEventSource(object): {"type": account_data_type, "content": content, "room_id": room_id} ) - defer.returnValue((results, current_stream_id)) + return (results, current_stream_id) @defer.inlineCallbacks def get_pagination_rows(self, user, config, key): - defer.returnValue(([], config.to_id)) + return ([], config.to_id) |