diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-27 15:34:01 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-27 15:34:01 +0100 |
| commit | 08881d808d7cfd600d130eb7a960c6c51c797a09 (patch) | |
| tree | 1a8c8833a981b9a01e5f8c68c555203f2bc59455 /synapse/rest/__init__.py | |
| parent | Index sources in a nicer fashion. (diff) | |
| parent | BF: use room_id if there is no alias (diff) | |
| download | synapse-08881d808d7cfd600d130eb7a960c6c51c797a09.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/rest/__init__.py')
| -rw-r--r-- | synapse/rest/__init__.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index 47896612ce..f33024e72a 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -15,8 +15,7 @@ from . import ( - room, events, register, login, profile, public, presence, initial_sync, - directory + room, events, register, login, profile, presence, initial_sync, directory ) @@ -40,7 +39,6 @@ class RestServletFactory(object): register.register_servlets(hs, client_resource) login.register_servlets(hs, client_resource) profile.register_servlets(hs, client_resource) - public.register_servlets(hs, client_resource) presence.register_servlets(hs, client_resource) initial_sync.register_servlets(hs, client_resource) directory.register_servlets(hs, client_resource) |