diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-01-22 16:40:14 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-01-22 16:40:14 +0000 |
| commit | 22f00a09ddc65f8950dec88ad4e0c6d659ec8039 (patch) | |
| tree | 6d28cd4b138954b86dfd8b82bd3dbfe67349d796 /synapse/app | |
| parent | Fix manifest. Ignore contrib and docs directories when checking manifest agai... (diff) | |
| parent | Move client rest tests back under rest (diff) | |
| download | synapse-22f00a09ddc65f8950dec88ad4e0c6d659ec8039.tar.xz | |
Merge pull request #30 from matrix-org/client_api_restructure
Move client v1 api rest servlets into a "client/v1" directory
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index afe3d19760..cd24bbdc79 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -26,8 +26,8 @@ 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 -from synapse.media.v0.content_repository import ContentRepoResource -from synapse.media.v1.media_repository import MediaRepositoryResource +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.http.matrixfederationclient import MatrixFederationHttpClient from synapse.api.urls import ( |