Skip to content

Commit 7a03b97

Browse files
committed
Merge remote-tracking branch 'origin/2.1.8-develop' into 2.1.8-develop-pr14
2 parents c477960 + b8b698b commit 7a03b97

File tree

15 files changed

+120
-108
lines changed

15 files changed

+120
-108
lines changed

app/code/Magento/Catalog/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"magento/module-catalog-sample-data": "Sample Data version:100.1.*"
3434
},
3535
"type": "magento2-module",
36-
"version": "101.0.5",
36+
"version": "101.0.6",
3737
"license": [
3838
"OSL-3.0",
3939
"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.1.3",
19+
"version": "100.1.4",
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": "100.1.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.1.4",
16+
"version": "100.1.5",
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": "100.1.*"
1616
},
1717
"type": "magento2-module",
18-
"version": "100.1.4",
18+
"version": "100.1.5",
1919
"license": [
2020
"OSL-3.0",
2121
"AFL-3.0"

app/code/Magento/Config/composer.json

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

app/code/Magento/ConfigurableProduct/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"magento/module-product-links-sample-data": "Sample Data version:100.1.*"
2424
},
2525
"type": "magento2-module",
26-
"version": "100.1.5",
26+
"version": "100.1.6",
2727
"license": [
2828
"OSL-3.0",
2929
"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": "100.1.*"
1212
},
1313
"type": "magento2-module",
14-
"version": "100.1.4",
14+
"version": "100.1.5",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

app/code/Magento/ImportExport/composer.json

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

app/code/Magento/Reports/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"magento/framework": "100.1.*"
2323
},
2424
"type": "magento2-module",
25-
"version": "100.1.2",
25+
"version": "100.1.3",
2626
"license": [
2727
"OSL-3.0",
2828
"AFL-3.0"

app/code/Magento/Swatches/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"magento/module-swatches-sample-data": "Sample Data version:100.1.*"
2020
},
2121
"type": "magento2-module",
22-
"version": "100.1.4",
22+
"version": "100.1.5",
2323
"license": [
2424
"proprietary"
2525
],

app/design/frontend/Magento/blank/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"magento/framework": "100.1.*"
77
},
88
"type": "magento2-theme",
9-
"version": "100.1.3",
9+
"version": "100.1.4",
1010
"license": [
1111
"OSL-3.0",
1212
"AFL-3.0"

app/design/frontend/Magento/luma/composer.json

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

composer.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,21 +88,21 @@
8888
"magento/module-bundle-import-export": "100.1.3",
8989
"magento/module-cache-invalidate": "100.1.3",
9090
"magento/module-captcha": "100.1.3",
91-
"magento/module-catalog": "101.0.5",
92-
"magento/module-catalog-import-export": "100.1.3",
93-
"magento/module-catalog-inventory": "100.1.4",
91+
"magento/module-catalog": "101.0.6",
92+
"magento/module-catalog-import-export": "100.1.4",
93+
"magento/module-catalog-inventory": "100.1.5",
9494
"magento/module-catalog-rule": "100.1.4",
9595
"magento/module-catalog-rule-configurable": "100.1.3",
96-
"magento/module-catalog-search": "100.1.4",
96+
"magento/module-catalog-search": "100.1.5",
9797
"magento/module-catalog-url-rewrite": "100.1.3",
9898
"magento/module-catalog-widget": "100.1.2",
9999
"magento/module-checkout": "100.1.5",
100100
"magento/module-checkout-agreements": "100.1.2",
101101
"magento/module-cms": "101.0.4",
102102
"magento/module-cms-url-rewrite": "100.1.2",
103-
"magento/module-config": "100.1.3",
103+
"magento/module-config": "100.1.4",
104104
"magento/module-configurable-import-export": "100.1.2",
105-
"magento/module-configurable-product": "100.1.5",
105+
"magento/module-configurable-product": "100.1.6",
106106
"magento/module-contact": "100.1.3",
107107
"magento/module-cookie": "100.1.2",
108108
"magento/module-cron": "100.1.3",
@@ -115,7 +115,7 @@
115115
"magento/module-directory": "100.1.3",
116116
"magento/module-downloadable": "100.1.2",
117117
"magento/module-downloadable-import-export": "100.1.2",
118-
"magento/module-eav": "100.1.4",
118+
"magento/module-eav": "100.1.5",
119119
"magento/module-email": "100.1.3",
120120
"magento/module-encryption-key": "100.1.2",
121121
"magento/module-fedex": "100.1.3",
@@ -125,7 +125,7 @@
125125
"magento/module-google-optimizer": "100.1.2",
126126
"magento/module-grouped-import-export": "100.1.2",
127127
"magento/module-grouped-product": "100.1.3",
128-
"magento/module-import-export": "100.1.3",
128+
"magento/module-import-export": "100.1.4",
129129
"magento/module-indexer": "100.1.3",
130130
"magento/module-integration": "100.1.3",
131131
"magento/module-layered-navigation": "100.1.2",
@@ -143,7 +143,7 @@
143143
"magento/module-product-alert": "100.1.3",
144144
"magento/module-product-video": "100.1.4",
145145
"magento/module-quote": "100.1.4",
146-
"magento/module-reports": "100.1.2",
146+
"magento/module-reports": "100.1.3",
147147
"magento/module-require-js": "100.1.3",
148148
"magento/module-review": "100.1.2",
149149
"magento/module-rss": "100.1.2",
@@ -160,7 +160,7 @@
160160
"magento/module-sitemap": "100.1.3",
161161
"magento/module-store": "100.1.5",
162162
"magento/module-swagger": "100.1.2",
163-
"magento/module-swatches": "100.1.4",
163+
"magento/module-swatches": "100.1.5",
164164
"magento/module-swatches-layered-navigation": "100.1.2",
165165
"magento/module-tax": "100.1.2",
166166
"magento/module-tax-import-export": "100.1.2",
@@ -180,16 +180,16 @@
180180
"magento/module-widget": "100.1.2",
181181
"magento/module-wishlist": "100.1.4",
182182
"magento/theme-adminhtml-backend": "100.1.2",
183-
"magento/theme-frontend-blank": "100.1.3",
184-
"magento/theme-frontend-luma": "100.1.4",
183+
"magento/theme-frontend-blank": "100.1.4",
184+
"magento/theme-frontend-luma": "100.1.5",
185185
"magento/language-de_de": "100.1.1",
186186
"magento/language-en_us": "100.1.1",
187187
"magento/language-es_es": "100.1.1",
188188
"magento/language-fr_fr": "100.1.1",
189189
"magento/language-nl_nl": "100.1.1",
190190
"magento/language-pt_br": "100.1.1",
191191
"magento/language-zh_hans_cn": "100.1.1",
192-
"magento/framework": "100.1.5",
192+
"magento/framework": "100.1.6",
193193
"trentrichardson/jquery-timepicker-addon": "1.4.3",
194194
"components/jquery": "1.11.0",
195195
"blueimp/jquery-file-upload": "5.6.14",

0 commit comments

Comments
 (0)