Skip to content

Commit 80cd41d

Browse files
committed
Merge branch '2.2-develop' into MAGETWO-71215-fix
2 parents 4d2d07e + 6d61ccd commit 80cd41d

File tree

11 files changed

+2880
-640
lines changed

11 files changed

+2880
-640
lines changed

dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,4 @@ Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem
199199
Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem
200200
IntegrationConfig.php
201201
*Test.php
202+
setup/performance-toolkit/aggregate-report

setup/performance-toolkit/README.md

Lines changed: 311 additions & 0 deletions
Large diffs are not rendered by default.

setup/performance-toolkit/README.txt

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)