summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-11-20 17:41:56 +0000
committerDavid Baker <dbkr@matrix.org>2014-11-20 17:41:56 +0000
commite377d3365293a25a9f4d38706da60f2c221fdf89 (patch)
treee20adc94d762f36500b93a655b19e4fb8852747a /synapse/app/homeserver.py
parentOops, I removed this param. (diff)
downloadsynapse-e377d3365293a25a9f4d38706da60f2c221fdf89.tar.xz
Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)
Diffstat (limited to 'synapse/app/homeserver.py')
-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 8f7d0cd749..c563d14104 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,