Merge remote-tracking branch 'upstream/2.2' into 2.2

ezecosystem · Oct 1, 2018 · aee7e82 · aee7e82
2 parents 70da216 + 467003f
commit aee7e82
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -78,7 +78,7 @@
         "symfony/phpunit-bridge": "^3.4.11"
     },
     "conflict": {
-        "symfony/symfony": "3.4.9||3.4.12",
+        "symfony/symfony": "3.4.9||3.4.12||3.4.16",
         "doctrine/dbal": "2.7.0"
     },
     "scripts": {