soupette 61a3740c06 Fix conflicts ...

Signed-off-by: soupette <cyril.lpz@gmail.com>

2020-11-23 14:43:07 +01:00

..

__tests__

Merge branch 'master' of github.com:strapi/strapi into features/application-settings

2020-10-21 14:56:00 +02:00

formatters

rename plugins::content-manager.create to plugins::content-manager.explorer.create and others

2020-07-08 11:09:51 +02:00

admin.js

Split init route to init & information endpoints (#8160)

2020-10-06 11:26:17 +02:00

authenticated-user.js

add upload permissions to default roles + second refacto

2020-07-08 11:09:52 +02:00

authentication.js

Fix missing event

2020-07-23 18:36:29 +02:00

permission.js

Make lint stricter and fix the errors

2020-11-02 19:41:42 +01:00

role.js

refacto

2020-10-19 17:01:46 +02:00

user.js

add batch delete for users

2020-07-16 12:57:54 +02:00

Webhooks.js

add webhooks for draftAndPublish + sanitize all webhooks info (#7629)

2020-09-22 17:39:29 +02:00