Skip to content

Commit a0f3318

Browse files
author
Alex Paliarush
committed
MAGETWO-80581: Merge code from 2.2.0 release branches into "2.2-develop" branches
1 parent 0248b2f commit a0f3318

File tree

118 files changed

+354
-352
lines changed

Some content is hidden

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

118 files changed

+354
-352
lines changed

‎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.0",
14+
"version": "100.2.0-dev",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/framework": "101.0.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.2.0",
16+
"version": "100.2.0-dev",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"magento/framework": "101.0.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.2.0",
10+
"version": "100.2.0-dev",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"magento/module-config": "101.0.*"
1717
},
1818
"type": "magento2-module",
19-
"version": "100.2.0",
19+
"version": "100.2.0-dev",
2020
"license": [
2121
"proprietary"
2222
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"magento/module-theme": "100.2.*"
2525
},
2626
"type": "magento2-module",
27-
"version": "100.2.0",
27+
"version": "100.2.0-dev",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/framework": "101.0.*"
1010
},
1111
"type": "magento2-module",
12-
"version": "100.2.0",
12+
"version": "100.2.0-dev",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"magento/module-theme": "100.2.*"
2525
},
2626
"type": "magento2-module",
27-
"version": "100.2.0",
27+
"version": "100.2.0-dev",
2828
"license": [
2929
"proprietary"
3030
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"magento/module-bundle-sample-data": "Sample Data version:100.2.*"
2626
},
2727
"type": "magento2-module",
28-
"version": "100.2.0",
28+
"version": "100.2.0-dev",
2929
"license": [
3030
"OSL-3.0",
3131
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"magento/framework": "101.0.*"
1212
},
1313
"type": "magento2-module",
14-
"version": "100.2.0",
14+
"version": "100.2.0-dev",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"magento/framework": "101.0.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.2.0",
10+
"version": "100.2.0-dev",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"zendframework/zend-session": "^2.7.3"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.2.0",
16+
"version": "100.2.0-dev",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"magento/module-catalog-sample-data": "Sample Data version:100.2.*"
3535
},
3636
"type": "magento2-module",
37-
"version": "102.0.0",
37+
"version": "102.0.0-dev",
3838
"license": [
3939
"OSL-3.0",
4040
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"ext-ctype": "*"
1717
},
1818
"type": "magento2-module",
19-
"version": "100.2.0",
19+
"version": "100.2.0-dev",
2020
"license": [
2121
"OSL-3.0",
2222
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/module-ui": "101.0.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.2.0",
16+
"version": "100.2.0-dev",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"magento/module-catalog-rule-sample-data": "Sample Data version:100.2.*"
1818
},
1919
"type": "magento2-module",
20-
"version": "101.0.0",
20+
"version": "101.0.0-dev",
2121
"license": [
2222
"OSL-3.0",
2323
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/module-catalog-rule": "101.0.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.2.0",
16+
"version": "100.2.0-dev",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"magento/framework": "101.0.*"
1616
},
1717
"type": "magento2-module",
18-
"version": "100.2.0",
18+
"version": "100.2.0-dev",
1919
"license": [
2020
"OSL-3.0",
2121
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"magento/module-ui": "101.0.*"
1515
},
1616
"type": "magento2-module",
17-
"version": "100.2.0",
17+
"version": "100.2.0-dev",
1818
"license": [
1919
"OSL-3.0",
2020
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"magento/framework": "101.0.*"
1515
},
1616
"type": "magento2-module",
17-
"version": "100.2.0",
17+
"version": "100.2.0-dev",
1818
"license": [
1919
"OSL-3.0",
2020
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"magento/module-cookie": "100.2.*"
2828
},
2929
"type": "magento2-module",
30-
"version": "100.2.0",
30+
"version": "100.2.0-dev",
3131
"license": [
3232
"OSL-3.0",
3333
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"magento/framework": "101.0.*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.2.0",
13+
"version": "100.2.0-dev",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"magento/module-cms-sample-data": "Sample Data version:100.2.*"
1919
},
2020
"type": "magento2-module",
21-
"version": "102.0.0",
21+
"version": "102.0.0-dev",
2222
"license": [
2323
"OSL-3.0",
2424
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/framework": "101.0.*"
1010
},
1111
"type": "magento2-module",
12-
"version": "100.2.0",
12+
"version": "100.2.0-dev",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/module-deploy": "100.2.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "101.0.0",
16+
"version": "101.0.0-dev",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"magento/framework": "101.0.*"
1212
},
1313
"type": "magento2-module",
14-
"version": "100.2.0",
14+
"version": "100.2.0-dev",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"magento/module-product-links-sample-data": "Sample Data version:100.2.*"
2525
},
2626
"type": "magento2-module",
27-
"version": "100.2.0",
27+
"version": "100.2.0-dev",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"magento/module-configurable-product": "100.2.*"
1313
},
1414
"type": "magento2-module",
15-
"version": "100.2.0",
15+
"version": "100.2.0-dev",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"magento/framework": "101.0.*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.2.0",
13+
"version": "100.2.0-dev",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"magento/module-backend": "100.2.*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.2.0",
13+
"version": "100.2.0-dev",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"magento/module-config": "101.0.*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.2.0",
13+
"version": "100.2.0-dev",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"magento/framework": "101.0.*"
1212
},
1313
"type": "magento2-module",
14-
"version": "100.2.0",
14+
"version": "100.2.0-dev",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"magento/module-customer-sample-data": "Sample Data version:100.2.*"
3030
},
3131
"type": "magento2-module",
32-
"version": "101.0.0",
32+
"version": "101.0.0-dev",
3333
"license": [
3434
"OSL-3.0",
3535
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"magento/framework": "101.0.*"
1313
},
1414
"type": "magento2-module",
15-
"version": "100.2.0",
15+
"version": "100.2.0-dev",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"magento/module-config": "101.0.*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.2.0",
13+
"version": "100.2.0-dev",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-config": "101.0.*"
99
},
1010
"type": "magento2-module",
11-
"version": "100.2.0",
11+
"version": "100.2.0-dev",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"magento/module-checkout": "100.2.*"
2020
},
2121
"type": "magento2-module",
22-
"version": "100.2.0",
22+
"version": "100.2.0-dev",
2323
"license": [
2424
"OSL-3.0",
2525
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.2.0",
13+
"version": "100.2.0-dev",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"magento/module-downloadable-sample-data": "Sample Data version:100.2.*"
2626
},
2727
"type": "magento2-module",
28-
"version": "100.2.0",
28+
"version": "100.2.0-dev",
2929
"license": [
3030
"OSL-3.0",
3131
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"magento/framework": "101.0.*"
1313
},
1414
"type": "magento2-module",
15-
"version": "100.2.0",
15+
"version": "100.2.0-dev",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"magento/framework": "101.0.*"
1212
},
1313
"type": "magento2-module",
14-
"version": "101.0.0",
14+
"version": "101.0.0-dev",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"magento/module-theme": "100.2.*"
1616
},
1717
"type": "magento2-module",
18-
"version": "100.2.0",
18+
"version": "100.2.0-dev",
1919
"license": [
2020
"OSL-3.0",
2121
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/framework": "101.0.*"
99
},
1010
"type": "magento2-module",
11-
"version": "100.2.0",
11+
"version": "100.2.0-dev",
1212
"license": [
1313
"proprietary"
1414
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"lib-libxml": "*"
1616
},
1717
"type": "magento2-module",
18-
"version": "100.2.0",
18+
"version": "100.2.0-dev",
1919
"license": [
2020
"OSL-3.0",
2121
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"magento/module-multishipping": "100.2.*"
1818
},
1919
"type": "magento2-module",
20-
"version": "100.2.0",
20+
"version": "100.2.0-dev",
2121
"license": [
2222
"OSL-3.0",
2323
"AFL-3.0"

0 commit comments

Comments
 (0)