Fix merge

2016-12-19 22:16:36 +01:00 · 2016-12-19 22:16:36 +01:00 · 411afbe854
parent c34af41cf8
commit 411afbe854
1 changed files with 1 additions and 0 deletions
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@ -29,6 +29,7 @@
        "symfony/dependency-injection": "~2.8|~3.0",
        "symfony/expression-language": "~2.8|~3.0",
        "symfony/finder": "~2.8|~3.0",
+        "symfony/form": "~2.8|~3.0",
        "symfony/routing": "~2.8|~3.0",
        "symfony/templating": "~2.8|~3.0",
        "symfony/yaml": "~2.8|~3.0",