Skip to content

Commit 988772d

Browse files
committed
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr107
2 parents b7af726 + c090069 commit 988772d

File tree

2 files changed

+35
-33
lines changed

2 files changed

+35
-33
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
},
7777
"require-dev": {
7878
"allure-framework/allure-phpunit": "~1.2.0",
79-
"magento/magento2-functional-testing-framework": "2.4.1",
79+
"magento/magento2-functional-testing-framework": "~2.4.3",
8080
"phpunit/phpunit": "~6.2.0",
8181
"squizlabs/php_codesniffer": "3.2.2",
8282
"phpmd/phpmd": "@stable",

composer.lock

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

0 commit comments

Comments
 (0)