Merge branch '2.6' into 2.7
* 2.6: [HttpKernel] Fix lowest dep Conflicts: src/Symfony/Component/HttpKernel/composer.json
This commit is contained in:
commit
5d841a2b03
@ -17,7 +17,7 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.9",
|
"php": ">=5.3.9",
|
||||||
"symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2",
|
"symfony/event-dispatcher": "~2.6,>=2.6.7",
|
||||||
"symfony/http-foundation": "~2.5,>=2.5.4",
|
"symfony/http-foundation": "~2.5,>=2.5.4",
|
||||||
"symfony/debug": "~2.6,>=2.6.2",
|
"symfony/debug": "~2.6,>=2.6.2",
|
||||||
"psr/log": "~1.0"
|
"psr/log": "~1.0"
|
||||||
|
Reference in New Issue
Block a user