Merged branch '1.0' into 1.1

ezsystems · Jul 24, 2020 · a7335a4 · a7335a4
2 parents 9e18035 + 18723d6
commit a7335a4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -65,6 +65,7 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.1"
     },
     "conflict": {
+        "symfony/cache": "5.0.11 || 5.1.3",
         "doctrine/dbal": "2.7.0",
         "ezsystems/ezpublish-legacy": "*",
         "phpunit/phpunit": "8.4.0"