Skip to content

Commit 8725d30

Browse files
Merge remote-tracking branch 'symfony/2.3' into lowest-25
* symfony/2.3: Test components using their lowest possible deps Conflicts: src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/DependencyInjection/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Validator/composer.json
2 parents 84d5cb4 + 793be49 commit 8725d30

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"require-dev": {
2525
"symfony/stopwatch": "~2.2",
26-
"symfony/dependency-injection": "~2.0",
26+
"symfony/dependency-injection": "~2.2",
2727
"symfony/expression-language": "~2.4",
2828
"symfony/config": "~2.2",
2929
"symfony/routing": "~2.1",

0 commit comments

Comments
 (0)