diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.2'

Browse Source 
* 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:
Fabien Potencier 2013-02-11 11:29:42 +01:00
commit 391389d0e4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/composer.json
View File

@ -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.*",

2
src/Symfony/Component/Routing/composer.json
View File

@ -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"