Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
version.num
diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js
index 324a9d7..130e538 100644
--- a/erpnext/utilities/page/users/users.js
+++ b/erpnext/utilities/page/users/users.js
@@ -197,7 +197,7 @@
btn.pwd_dialog.hide();
args.sys_admin_pwd = btn.pwd_dialog.get_values().sys_admin_pwd;
btn.set_working();
- me.update_security(args);
+ me.update_security(btn, args);
btn.done_working();
}
diff --git a/version.num b/version.num
index f9b0327..cd93ccc 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-815
\ No newline at end of file
+816