summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-22 18:23:24 +0100
committerGitHub <noreply@github.com>2016-08-22 18:23:24 +0100
commitd143f211c8c16117f6a2c9afe2b8c5746c5e186e (patch)
tree25b73acdb9f999f3274c29f6fa7c6bb70907b36f /synapse/rest/__init__.py
parentMerge pull request #1037 from matrix-org/markjh/add_stats_to_prometheus (diff)
parentMerge branch 'develop' into dbkr/notifications_api (diff)
downloadsynapse-d143f211c8c16117f6a2c9afe2b8c5746c5e186e.tar.xz
Merge pull request #1028 from matrix-org/dbkr/notifications_api
Add the Notifications 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 2e0e6babef..326780405e 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -46,6 +46,7 @@ from synapse.rest.client.v2_alpha import (
     account_data,
     report_event,
     openid,
+    notifications,
     devices,
     thirdparty,
 )
@@ -92,5 +93,6 @@ class ClientRestResource(JsonResource):
         account_data.register_servlets(hs, client_resource)
         report_event.register_servlets(hs, client_resource)
         openid.register_servlets(hs, client_resource)
+        notifications.register_servlets(hs, client_resource)
         devices.register_servlets(hs, client_resource)
         thirdparty.register_servlets(hs, client_resource)