diff options
| author | Krombel <krombel@krombel.de> | 2017-06-21 14:48:21 +0200 |
|---|---|---|
| committer | Krombel <krombel@krombel.de> | 2017-06-21 14:48:21 +0200 |
| commit | 4202fba82a255eb52783a91d873b91aa8ef2191c (patch) | |
| tree | 73975e960b5a80f7a466cbf62810639662093d4a /synapse/rest/__init__.py | |
| parent | replaced json.dumps with encode_canonical_json (diff) | |
| parent | Merge pull request #2292 from matrix-org/erikj/quarantine_media (diff) | |
| download | synapse-4202fba82a255eb52783a91d873b91aa8ef2191c.tar.xz | |
Merge branch 'develop' into avoid_duplicate_filters
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) |