diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
| commit | 66a4d3352447f170afcddd1270c1a743273d19e6 (patch) | |
| tree | 49ee0260dd816d6f7c640f742c4895c6b5cb10fb /synapse/rest/__init__.py | |
| parent | Merge branch 'develop' into storage_transactions (diff) | |
| parent | Merge branch 'client_server_url_rename' into develop (diff) | |
| download | synapse-66a4d3352447f170afcddd1270c1a743273d19e6.tar.xz | |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'synapse/rest/__init__.py')
| -rw-r--r-- | synapse/rest/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index da18933b63..47896612ce 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -15,7 +15,8 @@ from . import ( - room, events, register, login, profile, public, presence, im, directory + room, events, register, login, profile, public, presence, initial_sync, + directory ) @@ -41,5 +42,5 @@ class RestServletFactory(object): profile.register_servlets(hs, client_resource) public.register_servlets(hs, client_resource) presence.register_servlets(hs, client_resource) - im.register_servlets(hs, client_resource) + initial_sync.register_servlets(hs, client_resource) directory.register_servlets(hs, client_resource) |