Skip to content

Commit 2ed19f7

Browse files
author
Dmytro Voskoboinikov
committed
Merge remote-tracking branch 'helix/MAGETWO-83755' into MAGETWO-83261
2 parents 5f53373 + 550abf4 commit 2ed19f7

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

app/code/Magento/Analytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-backend": "100.2.*",
7-
"magento/module-config": "100.2.*",
7+
"magento/module-config": "101.0.*",
88
"magento/module-integration": "100.2.*",
99
"magento/module-store": "100.2.*",
10-
"magento/framework": "100.2.*"
10+
"magento/framework": "101.0.*"
1111
},
1212
"type": "magento2-module",
1313
"version": "100.2.0",

app/code/Magento/Braintree/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"magento/module-quote": "101.0.*",
1919
"magento/module-paypal": "100.2.*",
2020
"magento/module-ui": "101.0.*",
21-
"braintree/braintree_php": "3.22.0"
21+
"braintree/braintree_php": "3.25.0"
2222
},
2323
"suggest": {
2424
"magento/module-checkout-agreements": "100.2.*",

app/code/Magento/CatalogAnalytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
7-
"magento/module-catalog": "101.1.*"
6+
"magento/framework": "101.0.*",
7+
"magento/module-catalog": "102.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0",

app/code/Magento/CustomerAnalytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
7-
"magento/module-customer": "100.2.*"
6+
"magento/framework": "101.0.*",
7+
"magento/module-customer": "101.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0",

app/code/Magento/InstantPurchase/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"magento/module-shipping": "100.2.*",
1717
"magento/module-quote": "101.0.*",
1818
"magento/module-vault": "101.0.*",
19-
"magento/framework": "100.2.*"
19+
"magento/framework": "101.0.*"
2020
},
2121
"autoload": {
2222
"files": [

app/code/Magento/QuoteAnalytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
7-
"magento/module-quote": "100.2.*"
6+
"magento/framework": "101.0.*",
7+
"magento/module-quote": "101.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0",

app/code/Magento/ReviewAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
6+
"magento/framework": "101.0.*",
77
"magento/module-review": "100.2.*"
88
},
99
"type": "magento2-module",

app/code/Magento/SalesAnalytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
7-
"magento/module-sales": "100.2.*"
6+
"magento/framework": "101.0.*",
7+
"magento/module-sales": "101.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0",

app/code/Magento/WishlistAnalytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
7-
"magento/module-wishlist": "100.2.*"
6+
"magento/framework": "101.0.*",
7+
"magento/module-wishlist": "101.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0",

lib/internal/Magento/Framework/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"monolog/monolog": "^1.17",
2727
"oyejorge/less.php": "~1.7.0",
2828
"symfony/console": "~2.3, !=2.7.0",
29-
"tedivm/jshrink": "~1.1.0",
30-
"zendframework/zend-code": "^3.1.0",
29+
"tedivm/jshrink": "~1.2.0",
30+
"zendframework/zend-code": "~3.1.0",
3131
"zendframework/zend-crypt": "^2.6.0",
32-
"zendframework/zend-mvc": "~2.6.3",
32+
"zendframework/zend-mvc": "~2.7.12",
3333
"zendframework/zend-uri": "^2.5.1",
3434
"zendframework/zend-validator": "^2.6.0",
3535
"zendframework/zend-stdlib": "^2.7.7",

0 commit comments

Comments
 (0)