diff options
| author | Jason Robinson <jasonr@matrix.org> | 2021-01-26 10:15:32 +0200 |
|---|---|---|
| committer | Jason Robinson <jasonr@matrix.org> | 2021-01-26 10:15:32 +0200 |
| commit | cee4010f94f8f4dadbdaadac5a62c54c19e17505 (patch) | |
| tree | a73dc2cc9375f445402a4534adf4bc779c1d0d37 /synapse/rest/admin/__init__.py | |
| parent | Make natural join inner join (diff) | |
| parent | Don't error if deleting a non-existent pusher. (#9121) (diff) | |
| download | synapse-cee4010f94f8f4dadbdaadac5a62c54c19e17505.tar.xz | |
Merge branch 'develop' into jaywink/admin-forward-extremities
# Conflicts: # synapse/rest/admin/__init__.py
Diffstat (limited to 'synapse/rest/admin/__init__.py')
| -rw-r--r-- | synapse/rest/admin/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/admin/__init__.py b/synapse/rest/admin/__init__.py index 319ad7bf7f..57e0a10837 100644 --- a/synapse/rest/admin/__init__.py +++ b/synapse/rest/admin/__init__.py @@ -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) |