Skip to content

Commit d3a63b0

Browse files
author
Dmytro Voskoboinikov
committed
Merge commit 'refs/pull/1574/head' of https://github.com/magento/magento2ce into Qwerty-PR20171006
2 parents 9f2d501 + e50b5c8 commit d3a63b0

File tree

126 files changed

+391
-376
lines changed

Some content is hidden

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

126 files changed

+391
-376
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.metadata
44
/.project
55
/.settings
6+
/.vscode
67
atlassian*
78
/nbproject
89
/robots.txt

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-dev",
14+
"version": "100.2.0",
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-dev",
16+
"version": "100.2.0",
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-dev",
10+
"version": "100.2.0",
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-dev",
19+
"version": "100.2.0",
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-dev",
27+
"version": "100.2.0",
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-dev",
12+
"version": "100.2.0",
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-dev",
27+
"version": "100.2.0",
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-dev",
28+
"version": "100.2.0",
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-dev",
14+
"version": "100.2.0",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

0 commit comments

Comments
 (0)