diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-05 13:38:01 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-06-05 13:38:01 +0100 |
| commit | 40596aec0ec6da1e8918255b75eb5329292901ab (patch) | |
| tree | a918b5ebfc4b48f8996b247df7ca75cd7cbb5d0f /synapse/app/homeserver.py | |
| parent | Lint (diff) | |
| parent | Clean up debug logging (#5347) (diff) | |
| download | synapse-40596aec0ec6da1e8918255b75eb5329292901ab.tar.xz | |
Merge branch 'develop' into m-heroes-empty-room-name
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 79be977ea6..1045d28949 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -62,6 +62,7 @@ from synapse.python_dependencies import check_requirements from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource +from synapse.rest.admin import AdminRestResource from synapse.rest.key.v2 import KeyApiV2Resource from synapse.rest.media.v0.content_repository import ContentRepoResource from synapse.rest.well_known import WellKnownResource @@ -180,6 +181,7 @@ class SynapseHomeServer(HomeServer): "/_matrix/client/v2_alpha": client_resource, "/_matrix/client/versions": client_resource, "/.well-known/matrix/client": WellKnownResource(self), + "/_synapse/admin": AdminRestResource(self), }) if self.get_config().saml2_enabled: |