Merge branch '2.4'

ezpublishlegacy · Jan 14, 2019 · d37b40b · d37b40b
2 parents 84049c9 + 0dab290
commit d37b40b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -83,7 +83,8 @@
     },
     "conflict": {
         "symfony/symfony": "3.4.9||3.4.12||3.4.16",
-        "doctrine/dbal": "2.7.0"
+        "doctrine/dbal": "2.7.0",
+        "twig/twig": "2.6.1"
     },
     "scripts": {
         "symfony-scripts": [