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/rest | |
| 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/rest')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index e6725b03b0..f95627ee61 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -32,7 +32,6 @@ from synapse.api.errors import ( ) from synapse.api.filtering import Filter from synapse.events.utils import format_event_for_client_v2 -from synapse.http.endpoint import parse_and_validate_server_name from synapse.http.servlet import ( RestServlet, assert_params_in_dict, @@ -47,7 +46,7 @@ from synapse.storage.state import StateFilter from synapse.streams.config import PaginationConfig from synapse.types import RoomAlias, RoomID, StreamToken, ThirdPartyInstanceID, UserID from synapse.util import json_decoder -from synapse.util.stringutils import random_string +from synapse.util.stringutils import parse_and_validate_server_name, random_string if TYPE_CHECKING: import synapse.server |