Merge branch '2.3' into 2.4

ezecosystem · Jan 14, 2019 · 0dab290 · 0dab290
2 parents c838e53 + 782e2cb
commit 0dab290
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": [