Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit fcd7fc9d1d40 · 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
@@ -31,5 +31,7 @@
             "url": "https://github.com/symfony/contracts"
         }
     },
-    "version": "1.1.x-dev"
+    "extra": {
+        "branch-version": "1.1-dev"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,7 @@`
`31`	`31`	`"url": "https://github.com/symfony/contracts"`
`32`	`32`	`}`
`33`	`33`	`},`
`34`		`- "version": "1.1.x-dev"`
	`34`	`+ "extra": {`
	`35`	`+ "branch-version": "1.1-dev"`
	`36`	`+ }`
`35`	`37`	`}`