summary refs log tree commit diff
path: root/synapse/rest/client/v1/admin.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-04-02 13:47:08 +0100
committerRichard van der Hoff <richard@matrix.org>2019-04-02 13:47:08 +0100
commitf41c9d37d6acce042d86d2e6b146a881cfffd8a9 (patch)
tree4b12f0213c9e44865336071edafe95195506a85a /synapse/rest/client/v1/admin.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentFix sync bug when accepting invites (#4956) (diff)
downloadsynapse-f41c9d37d6acce042d86d2e6b146a881cfffd8a9.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
-rw-r--r--synapse/rest/client/v1/admin.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py

index e788769639..1a26f5a1a6 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py
@@ -647,8 +647,6 @@ class ResetPasswordRestServlet(ClientV1RestServlet): assert_params_in_dict(params, ["new_password"]) new_password = params['new_password'] - logger.info("new_password: %r", new_password) - yield self._set_password_handler.set_password( target_user_id, new_password, requester )