summary refs log tree commit diff
path: root/synapse/app/generic_worker.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-04-22 13:09:23 +0100
committerRichard van der Hoff <richard@matrix.org>2020-04-22 13:09:23 +0100
commit2aa5bf13c80726d7211cf251b837b10708ec456d (patch)
tree0b1ef558d52b093b7306d8cb3eb2b05a043555c6 /synapse/app/generic_worker.py
parentAdd ability to run replication protocol over redis. (#7040) (diff)
parentDo not treat display names as globs for push rules. (#7271) (diff)
downloadsynapse-2aa5bf13c80726d7211cf251b837b10708ec456d.tar.xz
Merge branch 'release-v1.12.4' into develop
Diffstat (limited to 'synapse/app/generic_worker.py')
-rw-r--r--synapse/app/generic_worker.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
index dcd0709a02..37afd2f810 100644
--- a/synapse/app/generic_worker.py
+++ b/synapse/app/generic_worker.py
@@ -110,6 +110,10 @@ from synapse.rest.client.v1.voip import VoipRestServlet
 from synapse.rest.client.v2_alpha import groups, sync, user_directory
 from synapse.rest.client.v2_alpha._base import client_patterns
 from synapse.rest.client.v2_alpha.account import ThreepidRestServlet
+from synapse.rest.client.v2_alpha.account_data import (
+    AccountDataServlet,
+    RoomAccountDataServlet,
+)
 from synapse.rest.client.v2_alpha.keys import KeyChangesServlet, KeyQueryServlet
 from synapse.rest.client.v2_alpha.register import RegisterRestServlet
 from synapse.rest.client.versions import VersionsRestServlet
@@ -501,6 +505,8 @@ class GenericWorkerServer(HomeServer):
                     ProfileDisplaynameRestServlet(self).register(resource)
                     ProfileRestServlet(self).register(resource)
                     KeyUploadServlet(self).register(resource)
+                    AccountDataServlet(self).register(resource)
+                    RoomAccountDataServlet(self).register(resource)
 
                     sync.register_servlets(self, resource)
                     events.register_servlets(self, resource)