summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2015-05-13 13:38:41 +0200
committerNicolas Grekas <nicolas.grekas@gmail.com>2015-05-13 13:38:41 +0200
commit4c7bd960282b017cd44aae49353c723f1da466af (patch)
treec00da63316f24a84c48b743e03cec722b8ba6ea5
parent3574d2f3848feb286a6f9b43dedce2d4f2634440 (diff)
parentbe8e01596f133c2c950b011fe8b0e261dc6c6f34 (diff)
downloadsymfony-security-4c7bd960282b017cd44aae49353c723f1da466af.zip
symfony-security-4c7bd960282b017cd44aae49353c723f1da466af.tar.gz
symfony-security-4c7bd960282b017cd44aae49353c723f1da466af.tar.bz2
Merge branch '2.8'
* 2.8: 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
-rw-r--r--Acl/README.md2
-rw-r--r--Acl/composer.json4
-rw-r--r--Core/README.md2
-rw-r--r--Core/composer.json4
-rw-r--r--Csrf/README.md2
-rw-r--r--Csrf/composer.json4
-rw-r--r--Http/README.md2
-rw-r--r--Http/composer.json4
8 files changed, 12 insertions, 12 deletions
diff --git a/Acl/README.md b/Acl/README.md
index d640ac2..96d0a28 100644
--- a/Acl/README.md
+++ b/Acl/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-http://symfony.com/doc/3.0/book/security.html
+https://symfony.com/doc/3.0/book/security.html
Tests
-----
diff --git a/Acl/composer.json b/Acl/composer.json
index 66ad4da..7819946 100644
--- a/Acl/composer.json
+++ b/Acl/composer.json
@@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony Security Component - ACL (Access Control List)",
"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": {
diff --git a/Core/README.md b/Core/README.md
index 4cc3c6d..3c6a117 100644
--- a/Core/README.md
+++ b/Core/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-http://symfony.com/doc/3.0/book/security.html
+https://symfony.com/doc/3.0/book/security.html
Tests
-----
diff --git a/Core/composer.json b/Core/composer.json
index d073aef..7671993 100644
--- a/Core/composer.json
+++ b/Core/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": {
diff --git a/Csrf/README.md b/Csrf/README.md
index 85f9114..d331d3c 100644
--- a/Csrf/README.md
+++ b/Csrf/README.md
@@ -9,7 +9,7 @@ Resources
Documentation:
-http://symfony.com/doc/3.0/book/security.html
+https://symfony.com/doc/3.0/book/security.html
Tests
-----
diff --git a/Csrf/composer.json b/Csrf/composer.json
index bfeb913..c87d418 100644
--- a/Csrf/composer.json
+++ b/Csrf/composer.json
@@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony Security Component - CSRF 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": {
diff --git a/Http/README.md b/Http/README.md
index abf0cce..af22657 100644
--- a/Http/README.md
+++ b/Http/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-http://symfony.com/doc/3.0/book/security.html
+https://symfony.com/doc/3.0/book/security.html
Tests
-----
diff --git a/Http/composer.json b/Http/composer.json
index 27354e7..172e0d3 100644
--- a/Http/composer.json
+++ b/Http/composer.json
@@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony Security Component - HTTP Integration",
"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": {