summary refs log tree commit diff
path: root/synapse/app/user_dir.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-04-11 10:59:00 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-04-11 10:59:00 +0100
commit427e6c4059e2eff5eacf114dc6708e2972ca36d2 (patch)
tree608df478fe94531db9a789e3c8d1e827a34d8302 /synapse/app/user_dir.py
parentUpdate README.rst (diff)
parentbump version/changelog (diff)
downloadsynapse-427e6c4059e2eff5eacf114dc6708e2972ca36d2.tar.xz
Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.3
Diffstat (limited to 'synapse/app/user_dir.py')
-rw-r--r--synapse/app/user_dir.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py
index 494ccb702c..5f845e80d1 100644
--- a/synapse/app/user_dir.py
+++ b/synapse/app/user_dir.py
@@ -43,7 +43,7 @@ from synapse.util.logcontext import LoggingContext, preserve_fn
 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.user_dir")
 
@@ -116,7 +116,7 @@ class UserDirectoryServer(HomeServer):
                         "/_matrix/client/api/v1": resource,
                     })
 
-        root_resource = create_resource_tree(resources, Resource())
+        root_resource = create_resource_tree(resources, NoResource())
 
         _base.listen_tcp(
             bind_addresses,