Merge branch '2.14.x' into 1.x

nicolas-grekas · nicolas-grekas · commit 72294147d32a · 2021-12-04T17:43:07.000+01:00
* 2.14.x:
  Update https instead of http in composer.json
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         {
             "name":     "Marco Pivetta",
             "email":    "ocramius@gmail.com",
-            "homepage": "http://ocramius.github.io/"
+            "homepage": "https://ocramius.github.io/"
         },
         {
             "name":     "Nicolas Grekas",

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`{`
`16`	`16`	`"name": "Marco Pivetta",`
`17`	`17`	`"email": "[email protected]",`
`18`		`- "homepage": "http://ocramius.github.io/"`
	`18`	`+ "homepage": "https://ocramius.github.io/"`
`19`	`19`	`},`
`20`	`20`	`{`
`21`	`21`	`"name": "Nicolas Grekas",`