soupette 61a3740c06 Fix conflicts ...

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

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

..

configurations.md

improve doc env vars

2020-11-09 17:01:17 +01:00

controllers.md

Add policies information to routing and link controllers to routing docs (#8445)

2020-10-26 09:40:30 -07:00

customization.md

…

draft-and-publish.md

Draft and Publish documentation - Fix (#8292)

2020-10-13 07:32:36 -07:00

file-structure.md

…

hooks.md

Per hook timeout config option (#8081)

2020-09-29 16:07:10 +02:00

middlewares.md

Adds warnings and workarounds for Brotli performance in koa-compress (#8261)

2020-10-14 13:07:32 +02:00

models.md

Fix query when populating morph relations (#8548)

2020-11-06 14:35:36 +01:00

plugins.md

…

policies.md

…

public-assets.md

…

queries.md

Fix conflicts

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

requests-responses.md

…

routing.md

Add policies information to routing and link controllers to routing docs (#8445)

2020-10-26 09:40:30 -07:00

services.md

Fix yarn lock conflict

2020-09-30 11:19:20 +02:00

templates.md

Fix typo in templates docs (#8571)

2020-11-04 07:24:45 -07:00

webhooks.md

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

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