diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
commit | 449739e6a364759a86f73417626af49d6a794e3d (patch) | |
tree | 04b2f39c91ec6098ffe3b380442787ac3ce2908f /synapse/rest/__init__.py | |
parent | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff) | |
parent | Check that we have auth headers and fail nicely (diff) | |
download | synapse-449739e6a364759a86f73417626af49d6a794e3d.tar.xz |
Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse
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) |