summary refs log tree commit diff
path: root/synapse/handlers/e2e_keys.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-13 13:17:08 +0000
committerErik Johnston <erik@matrix.org>2018-03-13 13:17:08 +0000
commitbf8e97bd3c11a4bdae9dcf255922b1ac2d03f5b3 (patch)
tree42423f71093a796415971f66ec4a24712bab42c2 /synapse/handlers/e2e_keys.py
parentAdd docstring (diff)
parentMerge pull request #2980 from matrix-org/erikj/rm_priv (diff)
downloadsynapse-bf8e97bd3c11a4bdae9dcf255922b1ac2d03f5b3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_remote_leave
Diffstat (limited to 'synapse/handlers/e2e_keys.py')
-rw-r--r--synapse/handlers/e2e_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py

index 9aa95f89e6..57f50a4e27 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py
@@ -40,7 +40,7 @@ class E2eKeysHandler(object): # doesn't really work as part of the generic query API, because the # query request requires an object POST, but we abuse the # "query handler" interface. - self.federation.register_query_handler( + hs.get_federation_registry().register_query_handler( "client_keys", self.on_federation_query_client_keys )