Jim Laurie 5bf1e51422 Fix conflicts

2018-02-12 13:25:43 +01:00

..

Jwt.js

Moved user validation logic from JWT service to permissions policy

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

Providers.js

New format store constructor

2018-02-06 13:10:43 +01:00

User.js

Fix set params id

2018-02-05 12:41:10 +01:00

UsersPermissions.js

Populate type field when creating a role #553

2018-02-06 14:43:26 +01:00