summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-04-14 13:37:15 +0100
committerMark Haines <mjark@negativecurvature.net>2015-04-14 13:37:15 +0100
commitbe7ead6946ef951e0b57a5df46d5392e2d11ab85 (patch)
tree50f8dbbdfa8b2157051e3e713ec4ba7fdd272bdf /synapse/app/homeserver.py
parentMerge pull request #120 from matrix-org/bugs/SYN-339 (diff)
parentMove server key api into rest/key/v1 (diff)
downloadsynapse-be7ead6946ef951e0b57a5df46d5392e2d11ab85.tar.xz
Merge pull request #121 from matrix-org/key-api-restructure
Move server key api into rest/key/v1
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 afb46d2e23..27e53a9e56 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -34,7 +34,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,