summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-11-20 18:25:31 +0000
committerDavid Baker <dbkr@matrix.org>2014-11-20 18:25:31 +0000
commit58f82e2e5484e9a83d0c184747442ac887e3b5d7 (patch)
treefb93f00e8ba6334d2a524d530e0bbf581fd76d25 /synapse/app
parentMerge branch 'develop' into pushers (diff)
parentFix pep8 and pyflakes warnings (diff)
downloadsynapse-58f82e2e5484e9a83d0c184747442ac887e3b5d7.tar.xz
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/app')
-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 a5833b2910..d24c934b3f 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -26,7 +26,7 @@ from twisted.web.server import Site
 from synapse.http.server import JsonResource, RootRedirect
 from synapse.http.content_repository import ContentRepoResource
 from synapse.http.server_key_resource import LocalKey
-from synapse.http.client import MatrixFederationHttpClient
+from synapse.http.matrixfederationclient import MatrixFederationHttpClient
 from synapse.api.urls import (
     CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX,
     SERVER_KEY_PREFIX,