Skip to content

Commit 1059a8c

Browse files
Merge branch '2.3' into 2.7
* 2.3: typofix - https://github.com/vlajos/misspell_fixer [Yaml] Nested merge keys Add support for variadic arguments in the GetSetNormalizer Conflicts: src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php src/Symfony/Component/Yaml/Tests/Fixtures/sfMergeKey.yml
2 parents 25a6d4f + 03b17ef commit 1059a8c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CHANGELOG
1414

1515
* Added 'host' option to firewall configuration
1616
* Added 'csrf_token_generator' and 'csrf_token_id' options to firewall logout
17-
listener configuration to supercede/alias 'csrf_provider' and 'intention'
17+
listener configuration to supersede/alias 'csrf_provider' and 'intention'
1818
respectively
1919
* Moved 'security.secure_random' service configuration to FrameworkBundle
2020

0 commit comments

Comments
 (0)