Skip to content

Commit f3b60bb

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: Fix CS Compatibility with doctrine/annotations 2 [Console] Fix a test when pcntl is not available (following #48329) [FrameworkBundle] fix: fix typo about help
2 parents 91ba64f + 05ec05a commit f3b60bb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"twig/twig": "^2.13|^3.0.4"
2222
},
2323
"require-dev": {
24-
"doctrine/annotations": "^1.12",
24+
"doctrine/annotations": "^1.12|^2",
2525
"egulias/email-validator": "^2.1.10|^3",
2626
"league/html-to-markdown": "^5.0",
2727
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",

0 commit comments

Comments
 (0)