Merge branch '3.4' into 4.1

* 3.4: bump required Twig version
2019-01-14 16:30:23 +01:00 · 2019-01-14 16:30:23 +01:00 · 175f6b5a84
commit 175f6b5a84
parent 00b73da791 f41f6c39cb
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@ -17,7 +17,7 @@
    ],
    "require": {
        "php": "^7.1.3",
-        "twig/twig": "^1.36.1|^2.6.1"
+        "twig/twig": "^1.37.1|^2.6.2"
    },
    "require-dev": {
        "symfony/asset": "~3.4|~4.0",