diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-29 15:59:05 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-29 15:59:05 +0100 |
| commit | f1bdf40dda5eaba622103b64e749b539e5ce6bf1 (patch) | |
| tree | a2a09ff016223528aafa4ce50c9b12698e44c6b1 /synapse/rest/__init__.py | |
| parent | No longer need the Freenode verification key file (diff) | |
| parent | Unbreak tests after changing storage API (diff) | |
| download | synapse-f1bdf40dda5eaba622103b64e749b539e5ce6bf1.tar.xz | |
Merge branch 'whois' of github.com:matrix-org/synapse 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) |