diff options
| author | Erik Johnston <erik@matrix.org> | 2017-06-07 11:05:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-06-07 11:05:23 +0100 |
| commit | 09e4bc05016a37f70111c4e54df10c9f070e8ba4 (patch) | |
| tree | e5cc39f79c3d855716c859c3e71969ae704a2054 /synapse/rest/__init__.py | |
| parent | Remove spurious log lines (diff) | |
| parent | Increase size of IP cache (diff) | |
| download | synapse-09e4bc05016a37f70111c4e54df10c9f070e8ba4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_fixup
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) |