summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorLuke Barnard <lukebarnard1@users.noreply.github.com>2017-04-13 14:21:31 +0100
committerGitHub <noreply@github.com>2017-04-13 14:21:31 +0100
commit78f0ddbfadefd877b161094d467d4863bd8890f9 (patch)
treec3e0ed7ccb314c91486358398f6d9192527cf15a /synapse/rest/__init__.py
parentMerge pull request #2115 from matrix-org/erikj/dedupe_federation_repl (diff)
parentCorrect logic in is_event_after (diff)
downloadsynapse-78f0ddbfadefd877b161094d467d4863bd8890f9.tar.xz
Merge pull request #2120 from matrix-org/luke/read-markers
Implement Read Marker API
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)