diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-13 13:34:46 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-13 13:34:46 +0200 |
| commit | ad8373bcf455be18e2bdbcec1c37b6c032d5943c (patch) | |
| tree | 2f468d5c72bfa108260c9e8204e02a1d3e73adc0 /Http | |
| parent | 69aa8266619387ed128df04d9909e8eda7e2e866 (diff) | |
| parent | db95dbe483b2f8ce7bae38ea37ae1f42fe141a6c (diff) | |
| download | symfony-security-ad8373bcf455be18e2bdbcec1c37b6c032d5943c.zip symfony-security-ad8373bcf455be18e2bdbcec1c37b6c032d5943c.tar.gz symfony-security-ad8373bcf455be18e2bdbcec1c37b6c032d5943c.tar.bz2 | |
Merge branch '2.6' into 2.7v2.7.0-BETA2
* 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
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/README.md | 2 | ||||
| -rw-r--r-- | Http/composer.json | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Http/README.md b/Http/README.md index 35437f2..7619bfc 100644 --- a/Http/README.md +++ b/Http/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/Http/composer.json b/Http/composer.json index eb6aeda..7b08d00 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": { |