Skip to content

Commit fef0535

Browse files
authored
Merge branch '2.4-develop' into fix-for-issue-38455
2 parents 4615e86 + 87b8b34 commit fef0535

File tree

2 files changed

+79
-73
lines changed

2 files changed

+79
-73
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"wikimedia/less.php": "^5.0"
9494
},
9595
"require-dev": {
96-
"magento/magento-allure-phpunit": "^3.0",
96+
"allure-framework/allure-phpunit": "^3.1",
9797
"dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0",
9898
"dg/bypass-finals": "^1.4",
9999
"friendsofphp/php-cs-fixer": "^3.22",

composer.lock

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

0 commit comments

Comments
 (0)