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/server.py | |
| 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/server.py')
| -rw-r--r-- | synapse/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py index d861efd2fd..e9add8e2b4 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -24,7 +24,7 @@ from synapse.events.utils import serialize_event from synapse.notifier import Notifier from synapse.api.auth import Auth from synapse.handlers import Handlers -from synapse.rest import RestServletFactory +from synapse.rest.client.v1 import RestServletFactory from synapse.state import StateHandler from synapse.storage import DataStore from synapse.types import UserID, RoomAlias, RoomID, EventID |