Merge 3.x into master

sonata-project · Jul 14, 2019 · 9a8e9a8 · 9a8e9a8
2 parents 8bd6f20 + bdd3398
commit 9a8e9a8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -53,7 +53,7 @@
         "symfony/twig-bundle": "^2.8 || ^3.2 || ^4.0",
         "symfony/validator": "^2.8 || ^3.2 || ^4.0",
         "twig/extensions": "^1.5",
-        "twig/twig": "^2.9"
+        "twig/twig": "^2.10"
     },
     "conflict": {
         "jms/di-extra-bundle": "<1.9",