summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-11 14:00:50 +0100
committerErik Johnston <erik@matrix.org>2019-06-11 14:00:50 +0100
commit03b09b32d6e368abe1ac0a5865d1be4fea7de787 (patch)
tree97311ef02ed7c2799fe77cf83b885be787313b4c /synapse/app/homeserver.py
parentMerge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-or... (diff)
parentMerge pull request #5424 from matrix-org/erikj/change_password_reset_links (diff)
downloadsynapse-03b09b32d6e368abe1ac0a5865d1be4fea7de787.tar.xz
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index df524a23dd..1045d28949 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py
@@ -176,7 +176,6 @@ class SynapseHomeServer(HomeServer): resources.update({ "/_matrix/client/api/v1": client_resource, - "/_synapse/password_reset": client_resource, "/_matrix/client/r0": client_resource, "/_matrix/client/unstable": client_resource, "/_matrix/client/v2_alpha": client_resource,