Skip to content

Commit 9a60998

Browse files
committed
Merge branch 'platform-health' of https://github.com/korovitskyi/magento2 into 33506-updated-elasticsearch-dep-version
� Conflicts: � composer.lock
2 parents e4aab93 + f5cd707 commit 9a60998

File tree

2 files changed

+130
-58
lines changed

2 files changed

+130
-58
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"laminas/laminas-view": "~2.12.0",
6161
"league/flysystem": "^2.0",
6262
"league/flysystem-aws-s3-v3": "^2.0",
63-
"magento/composer": "1.6.0",
63+
"magento/composer": "1.7.0",
6464
"magento/magento-composer-installer": ">=0.1.11",
6565
"magento/zendframework1": "~1.14.2",
6666
"monolog/monolog": "^1.17",

composer.lock

Lines changed: 129 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)