summary refs log tree commit diff
path: root/synapse/appservice/api.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-07-09 11:06:52 +0100
committerRichard van der Hoff <richard@matrix.org>2020-07-09 11:06:52 +0100
commitcc86fbc9addc65b3fcaede370190bce5451f9aa1 (patch)
tree1fcb0e700a8be2202b85820fb990011ecd558897 /synapse/appservice/api.py
parentMerge branch 'release-v1.15.2' into matrix-org-hotfixes (diff)
parentGenerate real events when we reject invites (#7804) (diff)
downloadsynapse-cc86fbc9addc65b3fcaede370190bce5451f9aa1.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/appservice/api.py')
-rw-r--r--synapse/appservice/api.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py

index da9a5e86d4..f92bfb420b 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py
@@ -98,7 +98,6 @@ class ApplicationServiceApi(SimpleHttpClient): if service.url is None: return False uri = service.url + ("/users/%s" % urllib.parse.quote(user_id)) - response = None try: response = yield self.get_json(uri, {"access_token": service.hs_token}) if response is not None: # just an empty json object