summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorLuke Barnard <lukeb@openmarket.com>2017-04-11 15:01:39 +0100
committerLuke Barnard <lukeb@openmarket.com>2017-04-11 15:01:39 +0100
commitd892079844eec9dd7855ee66f3ad3225df4bdbc0 (patch)
tree33b056a143505d065a30a64e4df331aab04ae08d /synapse/rest/__init__.py
parentInitial commit of RM server-side impl (diff)
downloadsynapse-d892079844eec9dd7855ee66f3ad3225df4bdbc0.tar.xz
Finish implementing RM endpoint
 - This change causes a 405 to be sent if "m.read_marker" is set via /account_data
 - This also fixes-up the RM endpoint so that it actually Works.
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 f9f5a3e077..aa8d874f96 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -40,6 +40,7 @@ from synapse.rest.client.v2_alpha import (
     register,
     auth,
     receipts,
+    read_marker,
     keys,
     tokenrefresh,
     tags,
@@ -88,6 +89,7 @@ class ClientRestResource(JsonResource):
         register.register_servlets(hs, client_resource)
         auth.register_servlets(hs, client_resource)
         receipts.register_servlets(hs, client_resource)
+        read_marker.register_servlets(hs, client_resource)
         keys.register_servlets(hs, client_resource)
         tokenrefresh.register_servlets(hs, client_resource)
         tags.register_servlets(hs, client_resource)