summary refs log tree commit diff
path: root/synapse/app/media_repository.py
diff options
context:
space:
mode:
authorkaiyou <pierre@jaury.eu>2018-04-14 12:27:16 +0200
committerkaiyou <pierre@jaury.eu>2018-04-14 12:27:16 +0200
commit041b41a825e456db180a89a9e4df6ea9f3d01c5b (patch)
treedb669225768b3322fe4d63451fdd05799634599a /synapse/app/media_repository.py
parentMerge remote-tracking branch 'upstream/master' into feat-dockerfile (diff)
parentMerge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff)
downloadsynapse-041b41a825e456db180a89a9e4df6ea9f3d01c5b.tar.xz
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'synapse/app/media_repository.py')
-rw-r--r--synapse/app/media_repository.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py
index 84c5791b3b..fc8282bbc1 100644
--- a/synapse/app/media_repository.py
+++ b/synapse/app/media_repository.py
@@ -43,7 +43,7 @@ from synapse.util.logcontext import LoggingContext
 from synapse.util.manhole import manhole
 from synapse.util.versionstring import get_version_string
 from twisted.internet import reactor
-from twisted.web.resource import Resource
+from twisted.web.resource import NoResource
 
 logger = logging.getLogger("synapse.app.media_repository")
 
@@ -84,7 +84,7 @@ class MediaRepositoryServer(HomeServer):
                         ),
                     })
 
-        root_resource = create_resource_tree(resources, Resource())
+        root_resource = create_resource_tree(resources, NoResource())
 
         _base.listen_tcp(
             bind_addresses,