summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-14 18:04:36 +0100
committerErik Johnston <erik@matrix.org>2015-09-14 18:04:36 +0100
commit228465b0ecfc7d7137ac3acaf30050e234957b6a (patch)
tree1e273d754bc819fecfb877e19a15a08b4d1e231a /synapse/rest/client
parentOnly allow people to set the alias list for their own domain. (diff)
parentMerge pull request #265 from matrix-org/erikj/check_room_exists (diff)
downloadsynapse-erikj/check_alias.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/check_alias github/erikj/check_alias erikj/check_alias
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v2_alpha/account.py1
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):