diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 16:54:12 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 16:54:12 +0100 |
| commit | 1d95e78759cc1307d15d6cc6388f52063e833355 (patch) | |
| tree | 0307617989016019bfd1d41a15b22499d02091ef /synapse/rest/__init__.py | |
| parent | add _get_room_member, fix datastore methods (diff) | |
| parent | Added RestServlet for /rooms/$roomid/initialSync (diff) | |
| download | synapse-1d95e78759cc1307d15d6cc6388f52063e833355.tar.xz | |
Merge branch 'develop' into storage_transactions
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) |