diff options
| author | Erik Johnston <erik@matrix.org> | 2017-09-19 11:07:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-09-19 11:07:45 +0100 |
| commit | b5feaa5a494e7f3fb1a0607002df54e4f17d20da (patch) | |
| tree | eae4a91e78c9215631fde08c69c4b2dd093c44e6 /synapse/rest/client/v2_alpha/keys.py | |
| parent | Merge pull request #2430 from matrix-org/erikj/groups_profile_cache (diff) | |
| parent | Fix overzealous kicking of guest users (#2453) (diff) | |
| download | synapse-b5feaa5a494e7f3fb1a0607002df54e4f17d20da.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged
Diffstat (limited to 'synapse/rest/client/v2_alpha/keys.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/keys.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py index 6a3cfe84f8..943e87e7fd 100644 --- a/synapse/rest/client/v2_alpha/keys.py +++ b/synapse/rest/client/v2_alpha/keys.py @@ -188,13 +188,11 @@ class KeyChangesServlet(RestServlet): user_id = requester.user.to_string() - changed = yield self.device_handler.get_user_ids_changed( + results = yield self.device_handler.get_user_ids_changed( user_id, from_token, ) - defer.returnValue((200, { - "changed": list(changed), - })) + defer.returnValue((200, results)) class OneTimeKeyServlet(RestServlet): |