Merge branch '3.0'

* 3.0: [TwigBridge] fix lowest required Form dependency
2016-03-28 09:08:36 +02:00 · 2016-03-28 09:08:36 +02:00 · 29469323eb
commit 29469323eb
parent c5c63dc142 27dc53edd6
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@ -22,7 +22,7 @@
    "require-dev": {
        "symfony/asset": "~2.8|~3.0",
        "symfony/finder": "~2.8|~3.0",
-        "symfony/form": "~2.8.4|~3.0.4",
+        "symfony/form": "~3.0.4",
        "symfony/http-kernel": "~2.8|~3.0",
        "symfony/polyfill-intl-icu": "~1.0",
        "symfony/routing": "~2.8|~3.0",