diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
| commit | 89dda613153c4869f3c9ce96f5cbc47f93f54723 (patch) | |
| tree | 320e718965e5e843fe3950bd8c19cf4b9ad367a6 /synapse/app/homeserver.py | |
| parent | 0.27.3 (diff) | |
| parent | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_id (diff) | |
| download | synapse-89dda613153c4869f3c9ce96f5cbc47f93f54723.tar.xz | |
Merge branch 'develop' into release-v0.27.0
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e477c7ced6..c00afbba28 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -56,7 +56,7 @@ from synapse.util.rlimit import change_resource_limit from synapse.util.versionstring import get_version_string from twisted.application import service from twisted.internet import defer, reactor -from twisted.web.resource import EncodingResourceWrapper, Resource +from twisted.web.resource import EncodingResourceWrapper, NoResource from twisted.web.server import GzipEncoderFactory from twisted.web.static import File @@ -126,7 +126,7 @@ class SynapseHomeServer(HomeServer): if WEB_CLIENT_PREFIX in resources: root_resource = RootRedirect(WEB_CLIENT_PREFIX) else: - root_resource = Resource() + root_resource = NoResource() root_resource = create_resource_tree(resources, root_resource) |