summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-20 16:10:14 +0100
committerErik Johnston <erik@matrix.org>2015-08-20 16:10:14 +0100
commitb578c822e3f382d6321c76ded3f9bd57c371ab86 (patch)
tree1949a627914b7f22f4450fc76d133db49e278b3b /synapse/rest
parentMerge pull request #237 from matrix-org/markjh/readme-rst-formatting (diff)
parentMerge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-b578c822e3f382d6321c76ded3f9bd57c371ab86.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/account.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
index 897c54b539..522a312c9e 100644
--- a/synapse/rest/client/v2_alpha/account.py
+++ b/synapse/rest/client/v2_alpha/account.py
@@ -79,7 +79,7 @@ class PasswordRestServlet(RestServlet):
         new_password = params['new_password']
 
         yield self.auth_handler.set_password(
-            user_id, new_password, None
+            user_id, new_password
         )
 
         defer.returnValue((200, {}))