summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-07-20 13:15:42 +0100
committerGitHub <noreply@github.com>2017-07-20 13:15:42 +0100
commitb3bf6a12182de14da0546a2f66ab85d32c1568fc (patch)
tree330a0dbfd3aa5ac29243e10ee4cc944b6658c65d /synapse/rest/__init__.py
parentMerge pull request #2363 from matrix-org/erikj/group_server_summary (diff)
parentFix typo (diff)
downloadsynapse-b3bf6a12182de14da0546a2f66ab85d32c1568fc.tar.xz
Merge pull request #2374 from matrix-org/erikj/group_server_local
Add local group server 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 3d809d181b..16f5a73b95 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -52,6 +52,7 @@ from synapse.rest.client.v2_alpha import (
     thirdparty,
     sendtodevice,
     user_directory,
+    groups,
 )
 
 from synapse.http.server import JsonResource
@@ -102,3 +103,4 @@ class ClientRestResource(JsonResource):
         thirdparty.register_servlets(hs, client_resource)
         sendtodevice.register_servlets(hs, client_resource)
         user_directory.register_servlets(hs, client_resource)
+        groups.register_servlets(hs, client_resource)