Jim Laurie de3da8eaf7 Fix conflicts

2018-02-19 19:56:23 +01:00

..

Jwt.js

Moved user validation logic from JWT service to permissions policy

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

Providers.js

Hot fix provider login

2018-02-14 17:02:44 +01:00

User.js

Delete file upload

2018-02-19 16:00:37 +01:00

UsersPermissions.js

Populate type field when creating a role #553

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