summary refs log tree commit diff
path: root/synapse/rest/client/room.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-08-18 14:23:52 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-08-18 14:23:52 +0100
commit2f4fe530a1cc12d6b7aec746bac55d40961616ac (patch)
treeaf56fac4739b696489f8e15617cbd81115b1a6cf /synapse/rest/client/room.py
parentMerge branch 'release-v1.41' into matrix-org-hotfixes (diff)
parentMount /_synapse/admin/v1/users/{userId}/media admin API on media workers only... (diff)
downloadsynapse-2f4fe530a1cc12d6b7aec746bac55d40961616ac.tar.xz
Merge branch 'release-v1.41' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/room.py')
-rw-r--r--synapse/rest/client/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py

index ed238b2141..c5c54564be 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py
@@ -1141,10 +1141,10 @@ def register_servlets(hs: "HomeServer", http_server, is_worker=False): JoinedRoomsRestServlet(hs).register(http_server) RoomAliasListServlet(hs).register(http_server) SearchRestServlet(hs).register(http_server) + RoomCreateRestServlet(hs).register(http_server) # Some servlets only get registered for the main process. if not is_worker: - RoomCreateRestServlet(hs).register(http_server) RoomForgetRestServlet(hs).register(http_server)