Skip to content

Commit c417848

Browse files
NadiyaSNadiyaS
committed
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-93042
2 parents 161eef0 + aa6b899 commit c417848

File tree

1,305 files changed

+9455
-6825
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,305 files changed

+9455
-6825
lines changed

‎CHANGELOG.md

Lines changed: 144 additions & 0 deletions

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE.txt renamed to ‎app/code/Magento/AdminNotification/Test/Mftf/LICENSE.txt

File renamed without changes.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE_AFL.txt renamed to ‎app/code/Magento/AdminNotification/Test/Mftf/LICENSE_AFL.txt

File renamed without changes.

‎app/code/Magento/AdminNotification/Test/Mftf/README.md

Lines changed: 3 additions & 0 deletions

‎app/code/Magento/AdminNotification/Test/Mftf/composer.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "magento/functional-test-module-admin-notification",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"php": "~7.0.13|~7.1.0",
9+
"magento/functional-test-module-store": "100.0.0-dev",
10+
"magento/functional-test-module-backend": "100.0.0-dev",
11+
"magento/functional-test-module-media-storage": "100.0.0-dev",
12+
"magento/magento2-functional-testing-framework": "2.2.0",
13+
"magento/functional-test-module-ui": "100.0.0-dev"
14+
},
15+
"type": "magento2-test",
16+
"license": [
17+
"OSL-3.0",
18+
"AFL-3.0"
19+
]
20+
}

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"lib-libxml": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "100.2.2",
14+
"version": "100.2.3",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE.txt renamed to ‎app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE.txt

File renamed without changes.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE_AFL.txt renamed to ‎app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE_AFL.txt

File renamed without changes.

‎app/code/Magento/AdvancedPricingImportExport/Test/Mftf/README.md

Lines changed: 3 additions & 0 deletions

‎app/code/Magento/AdvancedPricingImportExport/Test/Mftf/composer.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name": "magento/functional-test-module-advanced-pricing-import-export",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"php": "~7.0.13|~7.1.0",
9+
"magento/functional-test-module-catalog": "100.0.0-dev",
10+
"magento/functional-test-module-catalog-inventory": "100.0.0-dev",
11+
"magento/functional-test-module-eav": "100.0.0-dev",
12+
"magento/functional-test-module-import-export": "100.0.0-dev",
13+
"magento/functional-test-module-catalog-import-export": "100.0.0-dev",
14+
"magento/functional-test-module-customer": "100.0.0-dev",
15+
"magento/functional-test-module-store": "100.0.0-dev",
16+
"magento/magento2-functional-testing-framework": "2.2.0"
17+
},
18+
"type": "magento2-test",
19+
"license": [
20+
"OSL-3.0",
21+
"AFL-3.0"
22+
]
23+
}

0 commit comments

Comments
 (0)