Merge '3.4' into 4.0

api-platform · Dec 10, 2024 · c4d119d · c4d119d
2 parents be9521d + 5c1f3e5
commit c4d119d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/core/content-negotiation.md b/core/content-negotiation.md
@@ -19,7 +19,7 @@ API Platform will automatically detect the best resolving format depending on:
 Available formats are:
 
 | Format                                                | Format name | MIME types                    | Backward Compatibility guaranteed |
-| ----------------------------------------------------- | ----------- | ----------------------------- | --------------------------------- |
+|-------------------------------------------------------|-------------|-------------------------------|-----------------------------------|
 | [JSON-LD](https://json-ld.org)                        | `jsonld`    | `application/ld+json`         | yes                               |
 | [GraphQL](graphql.md)                                 | n/a         | n/a                           | yes                               |
 | [JSON:API](https://jsonapi.org/)                      | `jsonapi`   | `application/vnd.api+json`    | yes                               |

diff --git a/core/performance.md b/core/performance.md
@@ -41,8 +41,7 @@ The integration using the cache handler is quite simple. You just have to update
 +ENV CGO_ENABLED=1 XCADDY_SETCAP=1 XCADDY_GO_BUILD_FLAGS="-ldflags \"-w -s -extldflags '-Wl,-z,stack-size=0x80000'\""
 +RUN xcaddy build \
 +    --output /usr/local/bin/frankenphp \
-+    --with github.com/dunglas/frankenphp=./ \
-+    --with github.com/dunglas/frankenphp/caddy=./caddy/ \
++    --with github.com/dunglas/frankenphp/caddy \
 +    --with github.com/dunglas/mercure/caddy \
 +    --with github.com/dunglas/vulcain/caddy \
 +    --with github.com/dunglas/caddy-cbrotli \

diff --git a/extra/releases.md b/extra/releases.md
@@ -21,8 +21,6 @@ For example:
 
 Older versions (1.x, 2.6...) **are not maintained**. If you still use them, you must upgrade as soon as possible.
 
-There's a [crowdfunding for a 2.7 LTS version](https://opencollective.com/api-platform/projects/27-lts).
-
 The **old-stable** branch is merged in the **stable** branch on a regular basis to propagate [security fixes](security.md).
 The **stable** branch is merged in the **development** branch on a regular basis to propagate [security](security.md) and regular bugfixes.