summary refs log tree commit diff
path: root/synapse/rest/media/v1/config_resource.py
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2018-07-27 12:28:08 +0100
committerWill Hunt <will@half-shot.uk>2018-07-27 12:28:08 +0100
commit0f6e583e6ff598deab41976d16f7ca9eaa97fbd3 (patch)
tree555265be5e466a0f4b67203721c125a407f5d614 /synapse/rest/media/v1/config_resource.py
parentMerge remote-tracking branch 'upstream/develop' into hs/upload-limits (diff)
downloadsynapse-0f6e583e6ff598deab41976d16f7ca9eaa97fbd3.tar.xz
isorted this mess
Diffstat (limited to 'synapse/rest/media/v1/config_resource.py')
-rw-r--r--synapse/rest/media/v1/config_resource.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py

index 44d3d567aa..d6605b6027 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py
@@ -17,6 +17,7 @@ from twisted.internet import defer from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET + from synapse.http.server import respond_with_json, wrap_json_request_handler