Skip to content

Commit 23cc769

Browse files
committed
Merge remote-tracking branch 'mainline/2.3-develop' into 2.3-develop-pr21
2 parents a0f0d82 + c56341c commit 23cc769

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"friendsofphp/php-cs-fixer": "~2.13.0",
8787
"lusitanian/oauth": "~0.8.10",
8888
"magento/magento-coding-standard": "~1.0.0",
89-
"magento/magento2-functional-testing-framework": "~2.3.14",
89+
"magento/magento2-functional-testing-framework": "~2.4.0",
9090
"pdepend/pdepend": "2.5.2",
9191
"phpmd/phpmd": "@stable",
9292
"phpunit/phpunit": "~6.5.0",

composer.lock

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

0 commit comments

Comments
 (0)