Merge remote-tracking branch 'origin/2.5' into 2.5

ezsystems · Jul 12, 2021 · 81c2a80 · 81c2a80
2 parents 311925f + 8f8daee
commit 81c2a80
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -96,7 +96,7 @@
     "conflict": {
         "doctrine/dbal": "2.7.0",
         "doctrine/persistence": "1.3.2",
-        "laminas/laminas-code": "4.4.0",
+        "laminas/laminas-code": "^4.4",
         "symfony/symfony": "3.4.9||3.4.12||3.4.16",
         "symfony/webpack-encore-bundle": "1.2.0||1.2.1",
         "twig/twig": "2.6.1"