summary refs log tree commit diff
path: root/synapse/config/appservice.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/config/appservice.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/config/appservice.py')
-rw-r--r--synapse/config/appservice.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py

index e77d3387ff..ca43e96bd1 100644 --- a/synapse/config/appservice.py +++ b/synapse/config/appservice.py
@@ -134,7 +134,7 @@ def _load_appservice(hostname, as_info, config_filename): for regex_obj in as_info["namespaces"][ns]: if not isinstance(regex_obj, dict): raise ValueError( - "Expected namespace entry in %s to be an object," " but got %s", + "Expected namespace entry in %s to be an object, but got %s", ns, regex_obj, )