Merge branch '2.0'

* 2.0: Fix Symfony 4.1 build
2019-01-30 17:11:25 +01:00
parent 50f9a39cce c3e1a47e63
commit 09ba322bdf
1 changed files with 3 additions and 0 deletions
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,9 @@
        "symfony/framework-bundle": "^3.4|^4.1",
        "symfony/yaml": "^3.4|^4.1"
    },
+    "conflict": {
+        "symfony/dependency-injection": "4.1.11"
+    },
    "suggest": {
        "behat/mink-browserkit-driver": "^1.3"
    },