summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:26:10 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:26:10 +0100
commit15f31e1ca9c90bed34b2de084c669b81e48e7f22 (patch)
treeb34df1a72437244309c1b50204ca02a974f230ae /synapse/config/server.py
parentMerge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0 (diff)
parentSupport icons for Identity Providers (#9154) (diff)
downloadsynapse-15f31e1ca9c90bed34b2de084c669b81e48e7f22.tar.xz
Merge commit '0cd2938bc' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py

index a313e0e8cb..b76afce5e5 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -26,7 +26,7 @@ import yaml from netaddr import IPSet from synapse.api.room_versions import KNOWN_ROOM_VERSIONS -from synapse.http.endpoint import parse_and_validate_server_name +from synapse.util.stringutils import parse_and_validate_server_name from ._base import Config, ConfigError