Aurélien Georget b501e8bb1b Resolve conflicts

2019-01-05 20:33:47 +01:00

..

functions

Modify template for english

2018-08-27 08:11:23 -07:00

policies

Merge branch 'master' of github.com:strapi/strapi into add-cypress

2018-11-14 18:20:40 +01:00

queries

Revert codebase and apply limit, skip, start and sort parameters

2018-12-06 18:11:53 +01:00

layout.js

Fix to allow provider to be shown in the content manager

2018-12-11 17:40:57 +01:00

request.json

Add rate limit configs

2018-08-08 14:29:10 +02:00

routes.json

Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes

2018-09-19 17:36:59 +02:00

schema.graphql

Allow private attribute into input definition

2018-11-27 14:59:28 +01:00