diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-03 11:59:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-03 12:01:14 +0100 |
| commit | b50ea730b15706d0e2099f94cf8b3cf24b5c5433 (patch) | |
| tree | 05fb4bb1190f0f2223de49bf17060481a8bfad70 /synapse/app | |
| parent | Add option to change content repo location (diff) | |
| parent | Edited /presence REST servlet to raise SynapseErrors to return a standard err... (diff) | |
| download | synapse-b50ea730b15706d0e2099f94cf8b3cf24b5c5433.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts:
synapse/http/server.py
synapse/http/content_repository.py
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index fced1aa243..0fa4b40c94 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 |