diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-29 18:37:28 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-29 18:37:28 +0100 |
| commit | dca75a08ba5e64554f22813bd0a0356760a1be25 (patch) | |
| tree | cb28d1e16cc825d4b88bc814e9e6ea1b34783f15 /synapse/rest/__init__.py | |
| parent | Extended docs about the registration/login flows (diff) | |
| parent | Add a 'Redactions' section. (diff) | |
| download | synapse-dca75a08ba5e64554f22813bd0a0356760a1be25.tar.xz | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'synapse/rest/__init__.py')
| -rw-r--r-- | synapse/rest/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index 3b9aa59733..e391e5678d 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -15,7 +15,8 @@ from . import ( - room, events, register, login, profile, presence, initial_sync, directory, voip + room, events, register, login, profile, presence, initial_sync, directory, + voip, admin, ) @@ -43,3 +44,4 @@ class RestServletFactory(object): initial_sync.register_servlets(hs, client_resource) directory.register_servlets(hs, client_resource) voip.register_servlets(hs, client_resource) + admin.register_servlets(hs, client_resource) |