diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-13 13:36:16 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-13 13:36:16 +0200 |
| commit | be8e01596f133c2c950b011fe8b0e261dc6c6f34 (patch) | |
| tree | 02b38ee6a1487b13f706078518b2cdf2e1d0e304 /Csrf | |
| parent | 165c5e5d50896e657ff2b0d1663b4b224ef8294c (diff) | |
| parent | ad8373bcf455be18e2bdbcec1c37b6c032d5943c (diff) | |
| download | symfony-security-be8e01596f133c2c950b011fe8b0e261dc6c6f34.zip symfony-security-be8e01596f133c2c950b011fe8b0e261dc6c6f34.tar.gz symfony-security-be8e01596f133c2c950b011fe8b0e261dc6c6f34.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
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 'Csrf')
| -rw-r--r-- | Csrf/README.md | 2 | ||||
| -rw-r--r-- | Csrf/composer.json | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Csrf/README.md b/Csrf/README.md index 91c22cf..10f4784 100644 --- a/Csrf/README.md +++ b/Csrf/README.md @@ -9,7 +9,7 @@ Resources Documentation: -http://symfony.com/doc/2.8/book/security.html +https://symfony.com/doc/2.8/book/security.html Tests ----- diff --git a/Csrf/composer.json b/Csrf/composer.json index 14ae766..20fd2ff 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": { |