Merge branch '2.3' into 2.6
* 2.3: fix missing links to https://symfony.com [travis] Don't use the cache
This commit is contained in:
commit
c70874d517
|
@ -2,10 +2,6 @@ language: php
|
||||||
|
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
||||||
cache:
|
|
||||||
directories:
|
|
||||||
- $HOME/.composer/cache
|
|
||||||
|
|
||||||
addons:
|
addons:
|
||||||
apt_packages:
|
apt_packages:
|
||||||
- parallel
|
- parallel
|
||||||
|
|
|
@ -27,7 +27,7 @@ If you'd like to contribute, please read the following documents:
|
||||||
|
|
||||||
* [Backwards Compatibility][4]: Backward compatibility rules.
|
* [Backwards Compatibility][4]: Backward compatibility rules.
|
||||||
|
|
||||||
[1]: http://symfony.com/doc/current/contributing/code/index.html
|
[1]: https://symfony.com/doc/current/contributing/code/index.html
|
||||||
[2]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
|
[2]: https://symfony.com/doc/current/contributing/code/patches.html#check-list
|
||||||
[3]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
|
[3]: https://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
|
||||||
[4]: http://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code
|
[4]: https://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code
|
||||||
|
|
|
@ -2,7 +2,7 @@ CONTRIBUTORS
|
||||||
============
|
============
|
||||||
|
|
||||||
Symfony is the result of the work of many people who made the code better
|
Symfony is the result of the work of many people who made the code better
|
||||||
(see http://symfony.com/contributors for more information):
|
(see https://symfony.com/contributors for more information):
|
||||||
|
|
||||||
- Fabien Potencier (fabpot)
|
- Fabien Potencier (fabpot)
|
||||||
- Bernhard Schussek (bschussek)
|
- Bernhard Schussek (bschussek)
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"description": "The Symfony PHP framework",
|
"description": "The Symfony PHP framework",
|
||||||
"keywords": ["framework"],
|
"keywords": ["framework"],
|
||||||
"homepage": "http://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Symfony Community",
|
"name": "Symfony Community",
|
||||||
"homepage": "http://symfony.com/contributors"
|
"homepage": "https://symfony.com/contributors"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
|
|
Reference in New Issue