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

index 773da6022d..9629b26b01 100644 --- a/synapse/types.py +++ b/synapse/types.py
@@ -38,7 +38,7 @@ from six.moves import filter from unpaddedbase64 import decode_base64 from synapse.api.errors import Codes, SynapseError -from synapse.http.endpoint import parse_and_validate_server_name +from synapse.util.stringutils import parse_and_validate_server_name if TYPE_CHECKING: from synapse.appservice.api import ApplicationService