Merge branch '2.8' into 3.1

* 2.8: [SecurityBundle] Fix Twig master dep
2016-09-29 11:14:33 +01:00 · 2016-09-29 11:14:33 +01:00 · ea2da4f248
commit ea2da4f248
parent 6d1d35d83f 536da69a49
1 changed files with 1 additions and 0 deletions
--- 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",