Aurélien Georget b0aaae9f12 Resolve conflicts

2018-11-27 18:48:37 +01:00

..

Auth.js

Merge branch 'master' into fix/reattempt-1851

2018-11-17 20:27:08 +01:00

User.js

Allow private attribute into input definition

2018-11-27 14:59:28 +01:00

UsersPermissions.js

Fix for issue https://github.com/strapi/strapi/issues/1589

2018-08-16 14:17:54 +02:00