Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit a8d5f3109151 · 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
@@ -47,5 +47,7 @@
         "Resources/bin/var-dump-server"
     ],
     "minimum-stability": "dev",
-    "version": "4.4.x-dev"
+    "extra": {
+        "branch-version": "4.4-dev"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,7 @@`
`47`	`47`	`"Resources/bin/var-dump-server"`
`48`	`48`	`],`
`49`	`49`	`"minimum-stability": "dev",`
`50`		`- "version": "4.4.x-dev"`
	`50`	`+ "extra": {`
	`51`	`+ "branch-version": "4.4-dev"`
	`52`	`+ }`
`51`	`53`	`}`