Merge branch '2.6' into 3.6

GrahamCampbell · GrahamCampbell · commit b7109037a115 · 2021-12-12T22:59:57.000Z
diff --git a/composer.json b/composer.json
@@ -6,11 +6,13 @@
     "authors": [
         {
             "name": "Graham Campbell",
-            "email": "hello@gjcampbell.co.uk"
+            "email": "hello@gjcampbell.co.uk",
+            "homepage": "https://github.com/GrahamCampbell"
         },
         {
             "name": "Vance Lucas",
-            "email": "vance@vancelucas.com"
+            "email": "vance@vancelucas.com",
+            "homepage": "https://github.com/vlucas"
         }
     ],
     "require": {

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,13 @@`
`6`	`6`	`"authors": [`
`7`	`7`	`{`
`8`	`8`	`"name": "Graham Campbell",`
`9`		`- "email": "[email protected]"`
	`9`	`+ "email": "[email protected]",`
	`10`	`+ "homepage": "https://github.com/GrahamCampbell"`
`10`	`11`	`},`
`11`	`12`	`{`
`12`	`13`	`"name": "Vance Lucas",`
`13`		`- "email": "[email protected]"`
	`14`	`+ "email": "[email protected]",`
	`15`	`+ "homepage": "https://github.com/vlucas"`
`14`	`16`	`}`
`15`	`17`	`],`
`16`	`18`	`"require": {`