Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit ea2da4f2484d · 2016-09-29T11:14:33.000+01:00
* 2.8:
  [SecurityBundle] Fix Twig master dep
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -30,6 +30,7 @@
         "symfony/framework-bundle": "~2.8|~3.0",
         "symfony/http-foundation": "~2.8|~3.0",
         "symfony/security-acl": "~2.8|~3.0",
+        "symfony/templating": "~2.8|~3.0",
         "symfony/twig-bundle": "~2.8|~3.0",
         "symfony/twig-bridge": "~2.8|~3.0",
         "symfony/process": "~2.8|~3.0",
