diff options
| author | Erik Johnston <erikj@jki.re> | 2017-06-01 15:39:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 15:39:32 +0100 |
| commit | 87e5e05aeae3f921f17af4d57cfec6e15f104c42 (patch) | |
| tree | 45228bb7292a2cabd0a7c89ecaab42f7d33d3569 /synapse/rest/__init__.py | |
| parent | Merge pull request #2251 from matrix-org/erikj/current_state_delta_stream (diff) | |
| parent | Fix sqlite (diff) | |
| download | synapse-87e5e05aeae3f921f17af4d57cfec6e15f104c42.tar.xz | |
Merge pull request #2252 from matrix-org/erikj/user_dir
Add a user directory
Diffstat (limited to 'synapse/rest/__init__.py')
| -rw-r--r-- | synapse/rest/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index aa8d874f96..3d809d181b 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -51,6 +51,7 @@ from synapse.rest.client.v2_alpha import ( devices, thirdparty, sendtodevice, + user_directory, ) from synapse.http.server import JsonResource @@ -100,3 +101,4 @@ class ClientRestResource(JsonResource): devices.register_servlets(hs, client_resource) thirdparty.register_servlets(hs, client_resource) sendtodevice.register_servlets(hs, client_resource) + user_directory.register_servlets(hs, client_resource) |