Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-08 00:25:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into jaywink/admin-forward-extremities

Browse source 
# Conflicts:
#	synapse/rest/admin/__init__.py
This commit is contained in:
Jason Robinson 2021-01-26 10:15:32 +02:00
commit cee4010f94
10 changed files with 168 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/rest/admin/__init__.py
View file

@ -54,6 +54,7 @@ from synapse.rest.admin.users import (
PushersRestServlet,
ResetPasswordRestServlet,
SearchUsersRestServlet,
ShadowBanRestServlet,
UserAdminServlet,
UserMediaRestServlet,
UserMembershipRestServlet,
@ -233,6 +234,7 @@ def register_servlets(hs, http_server):
EventReportsRestServlet(hs).register(http_server)
PushersRestServlet(hs).register(http_server)
MakeRoomAdminRestServlet(hs).register(http_server)
ShadowBanRestServlet(hs).register(http_server)
ForwardExtremitiesRestServlet(hs).register(http_server)