Merge branch '2.6' into 2.7

nicolas-grekas · nicolas-grekas · commit dc0379c1c590 · 2015-05-13T13:34:46.000+02:00
* 2.6: fix missing links to https://symfony.com fix missing links to https://symfony.com [travis] Don't use the cache [DebugBundle] Remove inlined dumps on XHR Conflicts: src/Symfony/Component/Security/Acl/README.md src/Symfony/Component/Security/Core/README.md src/Symfony/Component/Security/Csrf/README.md src/Symfony/Component/Security/Http/README.md
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Resources
 
 Documentation:
 
-http://symfony.com/doc/2.7/book/security.html
+https://symfony.com/doc/2.7/book/security.html
 
 Tests
 -----
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Symfony Security Component - Core Library",
     "keywords": [],
-    "homepage": "http://symfony.com",
+    "homepage": "https://symfony.com",
     "license": "MIT",
     "authors": [
         {
@@ -12,7 +12,7 @@
         },
         {
             "name": "Symfony Community",
-            "homepage": "http://symfony.com/contributors"
+            "homepage": "https://symfony.com/contributors"
         }
     ],
     "require": {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"type": "library",`
`4`	`4`	`"description": "Symfony Security Component - Core Library",`
`5`	`5`	`"keywords": [],`
`6`		`- "homepage": "http://symfony.com",`
	`6`	`+ "homepage": "https://symfony.com",`
`7`	`7`	`"license": "MIT",`
`8`	`8`	`"authors": [`
`9`	`9`	`{`
`@@ -12,7 +12,7 @@`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"name": "Symfony Community",`
`15`		`- "homepage": "http://symfony.com/contributors"`
	`15`	`+ "homepage": "https://symfony.com/contributors"`
`16`	`16`	`}`
`17`	`17`	`],`
`18`	`18`	`"require": {`