Skip to content

Commit 5a46470

Browse files
cparticacpartica
committed
Merge branch '2.1' into FearlessKiwis-MAGETWO-56972-Clone-Watermarks-cant-be-set
2 parents 20b383f + 2765acf commit 5a46470

File tree

26 files changed

+123
-119
lines changed

26 files changed

+123
-119
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/framework": "100.1.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.1.0",
16+
"version": "100.1.1",
1717
"license": [
1818
"proprietary"
1919
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"magento/module-checkout-agreements": "100.1.*"
2424
},
2525
"type": "magento2-module",
26-
"version": "100.1.0",
26+
"version": "100.1.1",
2727
"license": [
2828
"proprietary"
2929
],

‎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.0",
36+
"version": "101.0.1",
3737
"license": [
3838
"OSL-3.0",
3939
"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.0",
16+
"version": "100.1.1",
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.1.*"
1818
},
1919
"type": "magento2-module",
20-
"version": "100.1.0",
20+
"version": "100.1.1",
2121
"license": [
2222
"OSL-3.0",
2323
"AFL-3.0"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"magento/module-catalog-rule": "100.1.*",
99
"magento/module-store": "100.1.*",
1010
"magento/module-customer": "100.1.*",
11-
"magento/magento-composer-installer": "*"
11+
"magento/magento-composer-installer": "*"
1212
},
1313
"suggest": {
1414
"magento/module-catalog-rule": "100.1.*"
1515
},
1616
"type": "magento2-module",
17-
"version": "100.1.0",
17+
"version": "100.1.1",
1818
"license": [
1919
"OSL-3.0",
2020
"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.0",
18+
"version": "100.1.1",
1919
"license": [
2020
"OSL-3.0",
2121
"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.1.*"
2828
},
2929
"type": "magento2-module",
30-
"version": "100.1.0",
30+
"version": "100.1.1",
3131
"license": [
3232
"OSL-3.0",
3333
"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.1.*"
1919
},
2020
"type": "magento2-module",
21-
"version": "101.0.0",
21+
"version": "101.0.1",
2222
"license": [
2323
"OSL-3.0",
2424
"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.0",
26+
"version": "100.1.1",
2727
"license": [
2828
"OSL-3.0",
2929
"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.1.*"
3030
},
3131
"type": "magento2-module",
32-
"version": "100.1.0",
32+
"version": "100.1.1",
3333
"license": [
3434
"OSL-3.0",
3535
"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-user": "100.1.*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.1.0",
13+
"version": "100.1.1",
1414
"license": [
1515
"OSL-3.0",
1616
"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.0",
14+
"version": "100.1.1",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"magento/module-grouped-product-sample-data": "Sample Data version:100.1.*"
2222
},
2323
"type": "magento2-module",
24-
"version": "100.1.0",
24+
"version": "100.1.1",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"

‎app/code/Magento/Indexer/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-module",
10-
"version": "100.1.0",
10+
"version": "100.1.1",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"magento/module-customer": "100.1.*"
1616
},
1717
"type": "magento2-module",
18-
"version": "100.1.0",
18+
"version": "100.1.1",
1919
"license": [
2020
"proprietary"
2121
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"magento/framework": "100.1.*"
2121
},
2222
"type": "magento2-module",
23-
"version": "100.1.0",
23+
"version": "100.1.1",
2424
"license": [
2525
"OSL-3.0",
2626
"AFL-3.0"

‎app/code/Magento/RequireJs/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-module",
9-
"version": "100.1.0",
9+
"version": "100.1.1",
1010
"license": [
1111
"OSL-3.0",
1212
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"magento/module-sales-sample-data": "Sample Data version:100.1.*"
3333
},
3434
"type": "magento2-module",
35-
"version": "100.1.0",
35+
"version": "100.1.1",
3636
"license": [
3737
"OSL-3.0",
3838
"AFL-3.0"

‎app/code/Magento/Store/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.0",
14+
"version": "100.1.1",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"magento/module-theme-sample-data": "Sample Data version:100.1.*"
2222
},
2323
"type": "magento2-module",
24-
"version": "100.1.0",
24+
"version": "100.1.1",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"

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

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

‎composer.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2ce",
33
"description": "Magento 2 (Community Edition)",
44
"type": "project",
5-
"version": "2.1.0",
5+
"version": "2.1.1",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"
@@ -80,42 +80,42 @@
8080
"magento/module-admin-notification": "100.1.0",
8181
"magento/module-advanced-pricing-import-export": "100.1.0",
8282
"magento/module-authorization": "100.1.0",
83-
"magento/module-authorizenet": "100.1.0",
83+
"magento/module-authorizenet": "100.1.1",
8484
"magento/module-backend": "100.1.0",
8585
"magento/module-backup": "100.1.0",
86-
"magento/module-braintree": "100.1.0",
86+
"magento/module-braintree": "100.1.1",
8787
"magento/module-bundle": "100.1.0",
8888
"magento/module-bundle-import-export": "100.1.0",
8989
"magento/module-cache-invalidate": "100.1.0",
9090
"magento/module-captcha": "100.1.0",
91-
"magento/module-catalog": "101.0.0",
91+
"magento/module-catalog": "101.0.1",
9292
"magento/module-catalog-import-export": "100.1.0",
93-
"magento/module-catalog-inventory": "100.1.0",
94-
"magento/module-catalog-rule": "100.1.0",
95-
"magento/module-catalog-rule-configurable": "100.1.0",
96-
"magento/module-catalog-search": "100.1.0",
93+
"magento/module-catalog-inventory": "100.1.1",
94+
"magento/module-catalog-rule": "100.1.1",
95+
"magento/module-catalog-rule-configurable": "100.1.1",
96+
"magento/module-catalog-search": "100.1.1",
9797
"magento/module-catalog-url-rewrite": "100.1.0",
9898
"magento/module-catalog-widget": "100.1.0",
99-
"magento/module-checkout": "100.1.0",
99+
"magento/module-checkout": "100.1.1",
100100
"magento/module-checkout-agreements": "100.1.0",
101-
"magento/module-cms": "101.0.0",
101+
"magento/module-cms": "101.0.1",
102102
"magento/module-cms-url-rewrite": "100.1.0",
103103
"magento/module-config": "100.1.0",
104104
"magento/module-configurable-import-export": "100.1.0",
105-
"magento/module-configurable-product": "100.1.0",
105+
"magento/module-configurable-product": "100.1.1",
106106
"magento/module-contact": "100.1.0",
107107
"magento/module-cookie": "100.1.0",
108108
"magento/module-cron": "100.1.0",
109109
"magento/module-currency-symbol": "100.1.0",
110-
"magento/module-customer": "100.1.0",
110+
"magento/module-customer": "100.1.1",
111111
"magento/module-customer-import-export": "100.1.0",
112-
"magento/module-deploy": "100.1.0",
112+
"magento/module-deploy": "100.1.1",
113113
"magento/module-developer": "100.1.0",
114114
"magento/module-dhl": "100.1.0",
115115
"magento/module-directory": "100.1.0",
116116
"magento/module-downloadable": "100.1.0",
117117
"magento/module-downloadable-import-export": "100.1.0",
118-
"magento/module-eav": "100.1.0",
118+
"magento/module-eav": "100.1.1",
119119
"magento/module-email": "100.1.0",
120120
"magento/module-encryption-key": "100.1.0",
121121
"magento/module-fedex": "100.1.0",
@@ -124,9 +124,9 @@
124124
"magento/module-google-analytics": "100.1.0",
125125
"magento/module-google-optimizer": "100.1.0",
126126
"magento/module-grouped-import-export": "100.1.0",
127-
"magento/module-grouped-product": "100.1.0",
127+
"magento/module-grouped-product": "100.1.1",
128128
"magento/module-import-export": "100.1.0",
129-
"magento/module-indexer": "100.1.0",
129+
"magento/module-indexer": "100.1.1",
130130
"magento/module-integration": "100.1.0",
131131
"magento/module-layered-navigation": "100.1.0",
132132
"magento/module-media-storage": "100.1.0",
@@ -137,18 +137,18 @@
137137
"magento/module-offline-payments": "100.1.0",
138138
"magento/module-offline-shipping": "100.1.0",
139139
"magento/module-page-cache": "100.1.0",
140-
"magento/module-payment": "100.1.0",
140+
"magento/module-payment": "100.1.1",
141141
"magento/module-paypal": "100.1.0",
142142
"magento/module-persistent": "100.1.0",
143143
"magento/module-product-alert": "100.1.0",
144-
"magento/module-product-video": "100.1.0",
145-
"magento/module-quote": "100.1.0",
144+
"magento/module-product-video": "100.1.1",
145+
"magento/module-quote": "100.1.1",
146146
"magento/module-reports": "100.1.0",
147-
"magento/module-require-js": "100.1.0",
147+
"magento/module-require-js": "100.1.1",
148148
"magento/module-review": "100.1.0",
149149
"magento/module-rss": "100.1.0",
150150
"magento/module-rule": "100.1.0",
151-
"magento/module-sales": "100.1.0",
151+
"magento/module-sales": "100.1.1",
152152
"magento/module-sales-rule": "100.1.0",
153153
"magento/module-sales-sequence": "100.1.0",
154154
"magento/module-sample-data": "100.1.0",
@@ -157,13 +157,13 @@
157157
"magento/module-send-friend": "100.1.0",
158158
"magento/module-shipping": "100.1.0",
159159
"magento/module-sitemap": "100.1.0",
160-
"magento/module-store": "100.1.0",
160+
"magento/module-store": "100.1.1",
161161
"magento/module-swagger": "100.1.0",
162162
"magento/module-swatches": "100.1.0",
163163
"magento/module-swatches-layered-navigation": "100.1.0",
164164
"magento/module-tax": "100.1.0",
165165
"magento/module-tax-import-export": "100.1.0",
166-
"magento/module-theme": "100.1.0",
166+
"magento/module-theme": "100.1.1",
167167
"magento/module-translation": "100.1.0",
168168
"magento/module-ui": "100.1.0",
169169
"magento/module-ups": "100.1.0",
@@ -177,7 +177,7 @@
177177
"magento/module-webapi-security": "100.1.0",
178178
"magento/module-weee": "100.1.0",
179179
"magento/module-widget": "100.1.0",
180-
"magento/module-wishlist": "100.1.0",
180+
"magento/module-wishlist": "100.1.1",
181181
"magento/theme-adminhtml-backend": "100.1.0",
182182
"magento/theme-frontend-blank": "100.1.0",
183183
"magento/theme-frontend-luma": "100.1.0",
@@ -188,7 +188,7 @@
188188
"magento/language-nl_nl": "100.1.0",
189189
"magento/language-pt_br": "100.1.0",
190190
"magento/language-zh_hans_cn": "100.1.0",
191-
"magento/framework": "100.1.0",
191+
"magento/framework": "100.1.1",
192192
"trentrichardson/jquery-timepicker-addon": "1.4.3",
193193
"components/jquery": "1.11.0",
194194
"blueimp/jquery-file-upload": "5.6.14",

0 commit comments

Comments
 (0)