Merge branch '2.8'

* 2.8: [Bundle\Twig] Fix lowet form dep Conflicts: src/Symfony/Bridge/Twig/composer.json
2015-11-28 13:50:03 +01:00 · 2015-11-28 13:50:03 +01:00 · c2b54bbf47
commit c2b54bbf47
parent 7ba5f7acb3 f94c6d4126
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|~3.0",
+        "symfony/form": "~2.8,>2.8-BETA1|~3.0,>3.0-BETA1",
        "symfony/http-kernel": "~2.8|~3.0",
        "symfony/polyfill-intl-icu": "~1.0",
        "symfony/routing": "~2.8|~3.0",