summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-01-06 18:09:04 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-01-06 18:09:04 +0000
commit7ac6ca7311c504971a4169b87ddc2e9d7df3fef1 (patch)
tree8a6541ca99831edda4a5c808a368ca74caecd445 /synapse/rest/__init__.py
parentMerge pull request #469 from matrix-org/markjh/joined_guest_access (diff)
parentAdd /_matrix/versions to report supported versions (diff)
downloadsynapse-7ac6ca7311c504971a4169b87ddc2e9d7df3fef1.tar.xz
Merge pull request #468 from matrix-org/daniel/versionsyo
Add /_matrix/versions to report supported versions
Diffstat (limited to 'synapse/rest/__init__.py')
-rw-r--r--synapse/rest/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 7b67e96204..43ef29db7b 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from synapse.rest.client import (
+    versions,
+)
+
 from synapse.rest.client.v1 import (
     room,
     events,
@@ -53,6 +57,8 @@ class ClientRestResource(JsonResource):
 
     @staticmethod
     def register_servlets(client_resource, hs):
+        versions.register_servlets(client_resource)
+
         # "v1"
         room.register_servlets(hs, client_resource)
         events.register_servlets(hs, client_resource)