Merge pull request #15313 from mauriciofauth/twig2-4.9

Add support for Twig 2
phpmyadmin · Jun 8, 2019 · 665e385 · 665e385
2 parents 2fe5150 + 3f0ef0f
commit 665e385
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -52,7 +52,7 @@
         "phpseclib/phpseclib": "^2.0",
         "google/recaptcha": "^1.1",
         "psr/container": "^1.0",
-        "twig/twig": "^1.34",
+        "twig/twig": "^1.34 || ^2.0",
         "twig/extensions": "~1.5.1",
         "symfony/expression-language": "^3.2 || ^2.8",
         "symfony/polyfill-mbstring": "^1.3"