summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-15 11:41:18 +0100
committerNeil Johnson <neil@matrix.org>2018-08-15 11:41:18 +0100
commit55afba0fc5164d3be08848668ddec4bba7fba923 (patch)
treee38f4c4acb4513cad7af30f979cd90f44156fbbc
parentreplace admin_email with admin_uri for greater flexibility (diff)
downloadsynapse-55afba0fc5164d3be08848668ddec4bba7fba923.tar.xz
update admin email to uri
-rw-r--r--changelog.d/3687.feature2
-rw-r--r--synapse/config/server.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/changelog.d/3687.feature b/changelog.d/3687.feature

index 93b24d1acb..64b89f6411 100644 --- a/changelog.d/3687.feature +++ b/changelog.d/3687.feature
@@ -1 +1 @@ -set admin email via config, to be used in error messages where the user should contact the administrator +set admin uri via config, to be used in error messages where the user should contact the administrator diff --git a/synapse/config/server.py b/synapse/config/server.py
index 442ee4fde4..2190f3210a 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -82,7 +82,7 @@ class ServerConfig(Config): self.hs_disabled = config.get("hs_disabled", False) self.hs_disabled_message = config.get("hs_disabled_message", "") - # Admin email to direct users at should their instance become blocked + # Admin uri to direct users at should their instance become blocked # due to resource constraints self.admin_uri = config.get("admin_uri", None)