Permalink
Browse files

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
  • Loading branch information...
2 parents 5503ea9 + 5be179b commit 4513920db019096d86c653552de73df89632a45c @fabpot fabpot committed Feb 11, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 composer.json
View
@@ -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.*",

0 comments on commit 4513920

Please sign in to comment.