Skip to content

Commit 4040823

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Bump license year Bump license year [Validator] Error using CssColor with doctrine annotations [HttpClient] Turn negative timeout to a very long timeout Features goes to 6.x branch [Translation] [LocoProvider] Fix use of asset ids fix lowest required PropertyInfo component release [Validator] throw when Constraint::_construct() has not been called Bump Symfony version to 5.4.3 Update VERSION for 5.4.2 Update CHANGELOG for 5.4.2 Bump Symfony version to 5.3.14 Update VERSION for 5.3.13 Update CHANGELOG for 5.3.13 Bump Symfony version to 4.4.37 Update VERSION for 4.4.36 Update CONTRIBUTORS for 4.4.36 Update CHANGELOG for 4.4.36 Allow symfony/runtime plugin
2 parents 46dd881 + 11bbb6e commit 4040823

File tree

105 files changed

+186
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+186
-141
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Additionally (see https://symfony.com/releases):
1515
- Always add tests and ensure they pass.
1616
- Bug fixes must be submitted against the lowest maintained branch where they apply
1717
(lowest branches are regularly merged to upper ones so they get the fixes too.)
18-
- Features and deprecations must be submitted against branch 5.x.
18+
- Features and deprecations must be submitted against the latest branch.
1919
- Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
2020
- Never break backward compatibility (see https://symfony.com/bc).
2121
-->

0 commit comments

Comments
 (0)