[Magento Community Engineering] Community Contributions - 2.3-develop

- merged latest code from mainline branch
hostep · Oct 25, 2019 · 37b2ab5 · 37b2ab5
2 parents 35e2402 + 5e07374
commit 37b2ab5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -88,7 +88,7 @@
         "friendsofphp/php-cs-fixer": "~2.14.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "~4.0.0",
-        "magento/magento2-functional-testing-framework": "2.5.0",
+        "magento/magento2-functional-testing-framework": "2.5.2",
         "pdepend/pdepend": "2.5.2",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "@stable",

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