Merge branch '2.3' into 2.6
* 2.3: [minor] composer.json fix Conflicts: src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Templating/composer.json
This commit is contained in:
commit
decd82eef7
@ -19,7 +19,7 @@
|
|||||||
"php": ">=5.3.3"
|
"php": ">=5.3.3"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/phpunit-bridge": "~2.7|~3.0.0"
|
"symfony/phpunit-bridge": "~2.7",
|
||||||
"symfony/expression-language": "~2.4"
|
"symfony/expression-language": "~2.4"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
"php": ">=5.3.3"
|
"php": ">=5.3.3"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/phpunit-bridge": "~2.7|~3.0.0"
|
"symfony/phpunit-bridge": "~2.7"
|
||||||
"psr/log": "~1.0"
|
"psr/log": "~1.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
|
Reference in New Issue
Block a user