diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-02 17:18:45 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-02 17:18:45 +0200 |
| commit | 588fe277b5b8319708a1afddb6e53cfcfdfa2281 (patch) | |
| tree | df88c787070ad4ba5c4a7d27346c03db45a11b7e | |
| parent | 79aa4b22c98c732296722724001cc985429f44fb (diff) | |
| parent | fbfcb38752f8b09da05bfbe2b59fcba4d0f526dd (diff) | |
| download | symfony-security-588fe277b5b8319708a1afddb6e53cfcfdfa2281.zip symfony-security-588fe277b5b8319708a1afddb6e53cfcfdfa2281.tar.gz symfony-security-588fe277b5b8319708a1afddb6e53cfcfdfa2281.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
link to https://symfony.com where possible
[FrameworkBundle] Added missing log in server:run command
[HttpFoundation] Allow curly braces in trusted host patterns
[profiler][security] check authenticated user by tokenClass instead of username.
Use https://symfony.com/search for searching
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
src/Symfony/Component/Form/README.md
src/Symfony/Component/Intl/README.md
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/README.md
src/Symfony/Component/Translation/README.md
src/Symfony/Component/Validator/README.md
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | composer.json | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -11,7 +11,7 @@ Resources Documentation: -http://symfony.com/doc/2.6/book/security.html +https://symfony.com/doc/2.6/book/security.html Tests ----- diff --git a/composer.json b/composer.json index 81e8582..1705183 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "library", "description": "Symfony Security Component", "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": { |