summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-05-22 15:31:08 +0100
committerGitHub <noreply@github.com>2018-05-22 15:31:08 +0100
commit82c2a52987a9d74f952607a47d9ea9d4f6542921 (patch)
treecc1ad373845797eb60dfafbc33e30bc3eb745435 /synapse
parentMerge pull request #3257 from matrix-org/rav/fonx_on_no_consent (diff)
parentFix dependency on jinja2 (diff)
downloadsynapse-82c2a52987a9d74f952607a47d9ea9d4f6542921.tar.xz
Merge pull request #3263 from matrix-org/rav/fix_jinja_dep
Fix dependency on jinja2
Diffstat (limited to 'synapse')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index bceb21a8d5..caccbaa814 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -41,7 +41,6 @@ from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \
 from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX
 from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory
 from synapse.rest import ClientRestResource
-from synapse.rest.consent.consent_resource import ConsentResource
 from synapse.rest.key.v1.server_key_resource import LocalKey
 from synapse.rest.key.v2 import KeyApiV2Resource
 from synapse.rest.media.v0.content_repository import ContentRepoResource
@@ -186,6 +185,7 @@ class SynapseHomeServer(HomeServer):
             })
 
         if name == "consent":
+            from synapse.rest.consent.consent_resource import ConsentResource
             consent_resource = ConsentResource(self)
             if compress:
                 consent_resource = gz_wrap(consent_resource)