summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-01-30 14:26:56 +0000
committerGitHub <noreply@github.com>2019-01-30 14:26:56 +0000
commit6587b0b89bf3014ec6c474999aba5ea1dbcb0ecd (patch)
treec993fd0c81679a0eef0f063ad3f0783695bc7e12 /synapse/rest/__init__.py
parentFix replication for room v3 (#4523) (diff)
parentMerge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ... (diff)
downloadsynapse-6587b0b89bf3014ec6c474999aba5ea1dbcb0ecd.tar.xz
Merge pull request #4472 from matrix-org/neilj/room_capabilities
Server capabilities support
Diffstat (limited to 'synapse/rest/__init__.py')
-rw-r--r--synapse/rest/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 66585c991f..91f5247d52 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -34,6 +34,7 @@ from synapse.rest.client.v2_alpha import (
     account,
     account_data,
     auth,
+    capabilities,
     devices,
     filter,
     groups,
@@ -107,3 +108,4 @@ class ClientRestResource(JsonResource):
         user_directory.register_servlets(hs, client_resource)
         groups.register_servlets(hs, client_resource)
         room_upgrade_rest_servlet.register_servlets(hs, client_resource)
+        capabilities.register_servlets(hs, client_resource)