Skip to content

Commit

Permalink
Merge remote-tracking branch 'symfony/2.5' into lowest-26
Browse files Browse the repository at this point in the history
* symfony/2.5:
  Test lowest versions of dependencies
  Test components using their lowest possible deps

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Security/composer.json
  • Loading branch information
nicolas-grekas committed Dec 16, 2014
2 parents 300d449 + a98f682 commit 6d96137
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"symfony/css-selector": "~2.0"
"symfony/css-selector": "~2.3"
},
"suggest": {
"symfony/css-selector": ""
Expand Down

0 comments on commit 6d96137

Please sign in to comment.