summary refs log tree commit diff
path: root/synapse/appservice/api.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-26 18:56:54 +0000
committerErik Johnston <erik@matrix.org>2019-11-26 18:56:54 +0000
commitc665d154a2de73e559a9a4d79999aeeee5cc62a8 (patch)
tree5be10050ee0a44f1c5347e4f319f537c0896c446 /synapse/appservice/api.py
parentMerge branch 'release-v1.6.0' of github.com:matrix-org/synapse into matrix-or... (diff)
parentRemove assertion and provide a clear warning on startup for missing public_ba... (diff)
downloadsynapse-c665d154a2de73e559a9a4d79999aeeee5cc62a8.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/appservice/api.py')
-rw-r--r--synapse/appservice/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py

index 3e25bf5747..57174da021 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py
@@ -185,7 +185,7 @@ class ApplicationServiceApi(SimpleHttpClient): if not _is_valid_3pe_metadata(info): logger.warning( - "query_3pe_protocol to %s did not return a" " valid result", uri + "query_3pe_protocol to %s did not return a valid result", uri ) return None