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 464fdfc + 46972c7 commit 42ae473dca8b052cbc32991f2f108ab40828879e @fabpot fabpot committed Feb 11, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 composer.json
View
@@ -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"

0 comments on commit 42ae473

Please sign in to comment.