[EngCom] Public Pull Requests - 2.3-develop

- merged latest code from mainline branch
okorshenko · May 7, 2019 · e6facbf · e6facbf
2 parents 4c40ed1 + c56341c
commit e6facbf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -86,7 +86,7 @@
         "friendsofphp/php-cs-fixer": "~2.13.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "~1.0.0",
-        "magento/magento2-functional-testing-framework": "~2.3.14",
+        "magento/magento2-functional-testing-framework": "~2.4.0",
         "pdepend/pdepend": "2.5.2",
         "phpmd/phpmd": "@stable",
         "phpunit/phpunit": "~6.5.0",

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