Aurélien Georget b0aaae9f12 Resolve conflicts

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

..

Jwt.js

Moved user validation logic from JWT service to permissions policy

2018-01-29 19:26:28 +01:00

Providers.js

Update username for Google Auth to fix #2285

2018-11-11 00:26:53 +05:30

User.js

Resolve conflicts

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

UsersPermissions.js

refactor: Fix misuse of map method

2018-11-15 15:51:23 -06:00