Merge branch '2.2'
* 2.2: fixed typos in composer.json version constraints Conflicts: src/Symfony/Component/DependencyInjection/composer.json src/Symfony/Component/Routing/composer.json
This commit is contained in:
commit
391389d0e4
@ -20,7 +20,7 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/yaml": "~2.0",
|
||||
"symfony/config": ">=2.2.*,<2.4-dev"
|
||||
"symfony/config": ">=2.2,<2.4-dev"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/yaml": "2.2.*",
|
||||
|
@ -19,7 +19,7 @@
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/config": ">=2.2.*,<2.4-dev",
|
||||
"symfony/config": ">=2.2,<2.4-dev",
|
||||
"symfony/yaml": "~2.0",
|
||||
"doctrine/common": "~2.2",
|
||||
"psr/log": "~1.0"
|
||||
|
Reference in New Issue
Block a user