Merge branch '3.2'

nicolas-grekas · nicolas-grekas · commit d29fc2ca9e72 · 2016-12-19T22:17:42.000+01:00
* 3.2:
  Fix merge
diff --git 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",
