Skip to content

Commit c4d119d

Browse files
committed
Merge '3.4' into 4.0
2 parents be9521d + 5c1f3e5 commit c4d119d

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

core/content-negotiation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ API Platform will automatically detect the best resolving format depending on:
1919
Available formats are:
2020

2121
| Format | Format name | MIME types | Backward Compatibility guaranteed |
22-
| ----------------------------------------------------- | ----------- | ----------------------------- | --------------------------------- |
22+
|-------------------------------------------------------|-------------|-------------------------------|-----------------------------------|
2323
| [JSON-LD](https://json-ld.org) | `jsonld` | `application/ld+json` | yes |
2424
| [GraphQL](graphql.md) | n/a | n/a | yes |
2525
| [JSON:API](https://jsonapi.org/) | `jsonapi` | `application/vnd.api+json` | yes |

core/performance.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ The integration using the cache handler is quite simple. You just have to update
4141
+ENV CGO_ENABLED=1 XCADDY_SETCAP=1 XCADDY_GO_BUILD_FLAGS="-ldflags \"-w -s -extldflags '-Wl,-z,stack-size=0x80000'\""
4242
+RUN xcaddy build \
4343
+ --output /usr/local/bin/frankenphp \
44-
+ --with github.com/dunglas/frankenphp=./ \
45-
+ --with github.com/dunglas/frankenphp/caddy=./caddy/ \
44+
+ --with github.com/dunglas/frankenphp/caddy \
4645
+ --with github.com/dunglas/mercure/caddy \
4746
+ --with github.com/dunglas/vulcain/caddy \
4847
+ --with github.com/dunglas/caddy-cbrotli \

extra/releases.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ For example:
2121

2222
Older versions (1.x, 2.6...) **are not maintained**. If you still use them, you must upgrade as soon as possible.
2323

24-
There's a [crowdfunding for a 2.7 LTS version](https://opencollective.com/api-platform/projects/27-lts).
25-
2624
The **old-stable** branch is merged in the **stable** branch on a regular basis to propagate [security fixes](security.md).
2725
The **stable** branch is merged in the **development** branch on a regular basis to propagate [security](security.md) and regular bugfixes.
2826

0 commit comments

Comments
 (0)