Merge remote-tracking branch 'upstream/master'

ezpublishlegacy · Jun 25, 2018 · fcb9f69 · fcb9f69
2 parents 83596f0 + 84de6fd
commit fcb9f69
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -77,7 +77,7 @@
         "symfony/phpunit-bridge": "^3.4.11"
     },
     "conflict": {
-        "symfony/symfony": "3.4.9",
+        "symfony/symfony": "3.4.9||3.4.12",
         "doctrine/dbal": "2.7.0"
     },
     "scripts": {