Skip to content

Commit 9a234e0

Browse files
committed
Merge branch '6.4' into 7.3
* 6.4: [MonologBridge] Improve error when HttpClient contract is installed but not the component [AssetMapper] Fix links to propshaft Document BC break in AbstractController::render
2 parents 8c17e2a + 6066342 commit 9a234e0

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ CHANGELOG
131131

132132
* Add `HttpClientAssertionsTrait`
133133
* Add `AbstractController::renderBlock()` and `renderBlockView()`
134+
* Remove call to `renderView()` in `AbstractController::render()`
134135
* Add native return type to `Translator` and to `Application::reset()`
135136
* Deprecate the integration of Doctrine annotations, either uninstall the `doctrine/annotations` package or disable the integration by setting `framework.annotations` to `false`
136137
* Enable `json_decode_detailed_errors` context for Serializer by default if `kernel.debug` is true and the `seld/jsonlint` package is installed

0 commit comments

Comments
 (0)