summary refs log tree commit diff
path: root/synapse/rest/media/v1/upload_resource.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-23 18:11:23 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-23 18:11:23 +0100
commit2d95fa1e5778625af66691e2c33470d7e8dcddd7 (patch)
tree3e37977013af9c867c5b8c11bfc0add74ff816ba /synapse/rest/media/v1/upload_resource.py
parentMerge commit 'e2904f720' into anoa/dinsic_release_1_31_0 (diff)
parentFederation API for Space summary (#9652) (diff)
downloadsynapse-2d95fa1e5778625af66691e2c33470d7e8dcddd7.tar.xz
Merge commit '4ecba9bd5' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/rest/media/v1/upload_resource.py')
-rw-r--r--synapse/rest/media/v1/upload_resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py

index ae5aef2f7f..0138b2e2d1 100644 --- a/synapse/rest/media/v1/upload_resource.py +++ b/synapse/rest/media/v1/upload_resource.py
@@ -26,8 +26,8 @@ from synapse.http.site import SynapseRequest from synapse.rest.media.v1.media_storage import SpamMediaException if TYPE_CHECKING: - from synapse.app.homeserver import HomeServer from synapse.rest.media.v1.media_repository import MediaRepository + from synapse.server import HomeServer logger = logging.getLogger(__name__)