diff options
author | Erik Johnston <erik@matrix.org> | 2015-09-14 18:05:31 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-09-14 18:05:31 +0100 |
commit | d59acb8c5b7ff74b0045b1e4df0c79ce6f645004 (patch) | |
tree | b7427c8e6cf1d48cab0341fbcbda307707e75338 /synapse/rest | |
parent | Also check the domains for membership state_keys (diff) | |
parent | Merge pull request #265 from matrix-org/erikj/check_room_exists (diff) | |
download | synapse-d59acb8c5b7ff74b0045b1e4df0c79ce6f645004.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
Diffstat (limited to 'synapse/rest')
-rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index b5edffdb60..4692ba413c 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -96,6 +96,7 @@ class ThreepidRestServlet(RestServlet): self.hs = hs self.identity_handler = hs.get_handlers().identity_handler self.auth = hs.get_auth() + self.auth_handler = hs.get_handlers().auth_handler @defer.inlineCallbacks def on_GET(self, request): |