summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-03 11:10:29 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-03 11:10:44 +0100
commitbf10cf5f1a16eaf741257b8b2670491c4d7caf25 (patch)
treecd2d66c6f3f2c004a2f454a420ddd351db715628 /synapse/app
parentURL decode user IDs for /profile REST path segments. (diff)
downloadsynapse-bf10cf5f1a16eaf741257b8b2670491c4d7caf25.tar.xz
move contentrepo class to it's own file
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index 8a7cd07fec..5e2a91b1da 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py
@@ -23,7 +23,8 @@ from twisted.enterprise import adbapi from twisted.web.resource import Resource from twisted.web.static import File from twisted.web.server import Site -from synapse.http.server import JsonResource, RootRedirect, ContentRepoResource +from synapse.http.server import JsonResource, RootRedirect +from synapse.http.content_repository import ContentRepoResource from synapse.http.client import TwistedHttpClient from synapse.api.urls import ( CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX