diff options
author | Erik Johnston <erikj@jki.re> | 2017-02-01 18:10:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-01 18:10:33 +0000 |
commit | 14d5e227003de2291986a915e121a3449e4f02fe (patch) | |
tree | 2db0e911aa3ab5cb2a2b5169e98552e1e37886b0 /synapse/rest/client/v2_alpha/keys.py | |
parent | Merge pull request #1871 from matrix-org/erikj/ratelimit_401 (diff) | |
parent | Doc args (diff) | |
download | synapse-14d5e227003de2291986a915e121a3449e4f02fe.tar.xz |
Merge pull request #1872 from matrix-org/erikj/key_changes
Include newly joined users in /keys/changes API
Diffstat (limited to 'synapse/rest/client/v2_alpha/keys.py')
-rw-r--r-- | synapse/rest/client/v2_alpha/keys.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py index 4590efa6bf..f99b53530a 100644 --- a/synapse/rest/client/v2_alpha/keys.py +++ b/synapse/rest/client/v2_alpha/keys.py @@ -189,7 +189,7 @@ class KeyChangesServlet(RestServlet): user_id = requester.user.to_string() changed = yield self.device_handler.get_user_ids_changed( - user_id, from_token.device_list_key, + user_id, from_token, ) defer.returnValue((200, { |