Merge branch '6.4' into 7.0

javiereguiluz · javiereguiluz · commit 253da8547ef4 · 2024-06-12T17:27:42.000+02:00
* 6.4:
  Fix indentation in upgrade_major.rst
diff --git a/setup/upgrade_major.rst b/setup/upgrade_major.rst
@@ -169,8 +169,8 @@ this one. For instance, update it to ``7.0.*`` to upgrade to Symfony 7.0:
       "extra": {
           "symfony": {
               "allow-contrib": false,
-    -       "require": "6.4.*"
-    +       "require": "7.0.*"
+    -         "require": "6.4.*"
+    +         "require": "7.0.*"
           }
       }
 

Original file line number	Diff line number	Diff line change
@@ -169,8 +169,8 @@ this one. For instance, update it to ``7.0.*`` to upgrade to Symfony 7.0:
`169`	`169`	`"extra": {`
`170`	`170`	`"symfony": {`
`171`	`171`	`"allow-contrib": false,`
`172`		`- - "require": "6.4.*"`
`173`		`- + "require": "7.0.*"`
	`172`	`+ - "require": "6.4.*"`
	`173`	`+ + "require": "7.0.*"`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`