cyril lopez 4bab690f5c Fix conflict

2017-12-04 15:52:44 +01:00

..

Auth.js

Review email reset password template

2017-12-04 14:11:00 +01:00

User.js

Fix user update encrypted password

2017-12-04 15:35:45 +01:00

UsersPermissions.js

Fix design

2017-12-04 15:03:53 +01:00