Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit e32acf6f3d76 · 2020-10-13T14:30:56.000+02:00
* 3.4:
  Remove "version" from composer.json files, use "branch-version" instead
diff --git a/composer.json b/composer.json
@@ -39,5 +39,7 @@
         "psr-4": { "Symfony\\Component\\Workflow\\": "" }
     },
     "minimum-stability": "dev",
-    "version": "4.4.x-dev"
+    "extra": {
+        "branch-version": "4.4-dev"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,7 @@`
`39`	`39`	`"psr-4": { "Symfony\\Component\\Workflow\\": "" }`
`40`	`40`	`},`
`41`	`41`	`"minimum-stability": "dev",`
`42`		`- "version": "4.4.x-dev"`
	`42`	`+ "extra": {`
	`43`	`+ "branch-version": "4.4-dev"`
	`44`	`+ }`
`43`	`45`	`}`