summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-15 10:27:20 +0100
committerErik Johnston <erik@matrix.org>2015-04-15 10:27:20 +0100
commit6606f7c659b7271eda2eb177cd111094d37e5215 (patch)
treea86fa67c08939849322897a85b7b6a7a452cb255 /synapse/app/homeserver.py
parentUse try..finally in contextlib.contextmanager (diff)
parentMerge pull request #122 from matrix-org/upgrade_syutil_to_0.0.4 (diff)
downloadsynapse-6606f7c659b7271eda2eb177cd111094d37e5215.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
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 033011e1d7..f8a33120b5 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -33,7 +33,7 @@ from twisted.web.server import Site
 from synapse.http.server import JsonResource, RootRedirect
 from synapse.rest.media.v0.content_repository import ContentRepoResource
 from synapse.rest.media.v1.media_repository import MediaRepositoryResource
-from synapse.http.server_key_resource import LocalKey
+from synapse.rest.key.v1.server_key_resource import LocalKey
 from synapse.http.matrixfederationclient import MatrixFederationHttpClient
 from synapse.api.urls import (
     CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX,