Aurelsicoko 1ac6a56ce0 Resolve conflicts

2018-01-25 15:26:25 +01:00

..

functions

Resolve conflicts

2018-01-25 15:26:25 +01:00

policies

Don't execute the action again if there is a policy

2018-01-24 19:00:12 +01:00

queries

Fix delete role with Bookshelf

2018-01-23 19:08:36 +01:00

advanced.json

Resolve conflicts

2018-01-25 15:26:25 +01:00

layout.js

fix(plugin-users-permissions): Config layout -

2018-01-11 00:23:28 +01:00

routes.json

Fix conflict

2018-01-25 13:43:07 +01:00