cyril lopez a7b56b484f Fix conflict

2017-11-29 19:00:51 +01:00

..

Jwt.js

Use request route to detect current action

2017-11-27 16:47:16 +01:00

User.js

Add get policy functions

2017-11-29 18:45:51 +01:00

UsersPermissions.js

Fix query bookshelf and modify init role file

2017-11-29 15:42:11 +01:00