Jim Laurie a6e78f023b Fix conflicts

2018-01-23 10:55:57 +01:00

..

functions

Fix conflicts

2018-01-23 10:55:57 +01:00

policies

Hot fix permission detection

2018-01-19 07:38:30 +01:00

queries

Check if token user still exist

2017-12-14 16:12:39 +01:00

layout.js

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

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

routes.json

Get and update advanced settings

2018-01-15 16:23:54 +01:00