Merge pull request #126 from laminas/3.11.x-merge-up-into-3.12.x_grxc…

…cdKu Merge release 3.11.2 into 3.12.x
laminas · Apr 7, 2022 · 5a9d84d · 5a9d84d
2 parents d87d260 + 537b912
commit 5a9d84d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -53,6 +53,7 @@
         "psr/container-implementation": "^1.0"
     },
     "conflict": {
+        "ext-psr": "*",
         "laminas/laminas-code": "<3.3.1",
         "zendframework/zend-code": "<3.3.1",
         "zendframework/zend-servicemanager": "*"

diff --git a/composer.lock b/composer.lock