Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 514676a88735 · 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
@@ -38,10 +38,10 @@
     ],
     "minimum-stability": "dev",
     "extra": {
+        "branch-version": "4.4-dev",
         "thanks": {
             "name": "phpunit/phpunit",
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
-    },
-    "version": "4.4.x-dev"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@`
`38`	`38`	`],`
`39`	`39`	`"minimum-stability": "dev",`
`40`	`40`	`"extra": {`
	`41`	`+ "branch-version": "4.4-dev",`
`41`	`42`	`"thanks": {`
`42`	`43`	`"name": "phpunit/phpunit",`
`43`	`44`	`"url": "https://github.com/sebastianbergmann/phpunit"`
`44`	`45`	`}`
`45`		`- },`
`46`		`- "version": "4.4.x-dev"`
	`46`	`+ }`
`47`	`47`	`}`