summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-11 20:16:25 +0000
committerErik Johnston <erik@matrix.org>2016-03-11 20:16:25 +0000
commit494d0c8e0244dc6c9c7c3422cbeccc3cbe9283d8 (patch)
tree641a9a66c62ee6dfac1111ac6147c8ca7f498c66 /synapse/rest/__init__.py
parentMerge pull request #643 from matrix-org/markjh/parse_json_II (diff)
parentThats not how transactions work. (diff)
downloadsynapse-494d0c8e0244dc6c9c7c3422cbeccc3cbe9283d8.tar.xz
Merge pull request #642 from matrix-org/erikj/logout
Implement logout
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 433237c204..6688fa8fa0 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -30,6 +30,7 @@ from synapse.rest.client.v1 import (
     push_rule,
     register as v1_register,
     login as v1_login,
+    logout,
 )
 
 from synapse.rest.client.v2_alpha import (
@@ -72,6 +73,7 @@ class ClientRestResource(JsonResource):
         admin.register_servlets(hs, client_resource)
         pusher.register_servlets(hs, client_resource)
         push_rule.register_servlets(hs, client_resource)
+        logout.register_servlets(hs, client_resource)
 
         # "v2"
         sync.register_servlets(hs, client_resource)