diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-01-20 13:15:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 08:15:14 -0500 |
| commit | 0cd2938bc854d947ae8102ded688a626c9fac5b5 (patch) | |
| tree | b125ffde49f269d946f602ea70beba27864d813f /synapse/federation/transport | |
| parent | Merge remote-tracking branch 'origin/develop' into release-v1.26.0 (diff) | |
| download | synapse-0cd2938bc854d947ae8102ded688a626c9fac5b5.tar.xz | |
Support icons for Identity Providers (#9154)
Diffstat (limited to 'synapse/federation/transport')
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index cfd094e58f..95c64510a9 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -28,7 +28,6 @@ from synapse.api.urls import ( FEDERATION_V1_PREFIX, FEDERATION_V2_PREFIX, ) -from synapse.http.endpoint import parse_and_validate_server_name from synapse.http.server import JsonResource from synapse.http.servlet import ( parse_boolean_from_args, @@ -45,6 +44,7 @@ from synapse.logging.opentracing import ( ) from synapse.server import HomeServer from synapse.types import ThirdPartyInstanceID, get_domain_from_id +from synapse.util.stringutils import parse_and_validate_server_name from synapse.util.versionstring import get_version_string logger = logging.getLogger(__name__) |