diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 16:19:44 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 16:19:44 +0100 |
| commit | d0103400b556138fca36160fd0273c0141ca94c4 (patch) | |
| tree | 0a66e58777d171743b72cf0e93240f747c6a5825 /synapse/rest/__init__.py | |
| parent | Use state_key rather than target_user_id (diff) | |
| parent | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro... (diff) | |
| download | synapse-d0103400b556138fca36160fd0273c0141ca94c4.tar.xz | |
Merge branch 'client_server_url_rename' into develop
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) |