Skip to content

Commit 8829d6d

Browse files
committed
Merge remote-tracking branch 'origin/2.2.10-develop' into MAGETWO-98919
2 parents 7ce2bc1 + 9476a3f commit 8829d6d

File tree

132 files changed

+153
-157
lines changed

Some content is hidden

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

132 files changed

+153
-157
lines changed

app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.0|~7.2.0",
5+
"php": "~7.0.13|~7.1.0|~7.2.0",
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-media-storage": "100.2.*",

app/code/Magento/AdvancedPricingImportExport/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.0|~7.2.0",
5+
"php": "~7.0.13|~7.1.0|~7.2.0",
66
"magento/module-catalog": "102.0.*",
77
"magento/module-catalog-inventory": "100.2.*",
88
"magento/module-eav": "101.0.*",

app/code/Magento/Analytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-analytics",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.0|~7.2.0",
5+
"php": "~7.0.13|~7.1.0|~7.2.0",
66
"magento/module-backend": "100.2.*",
77
"magento/module-config": "101.0.*",
88
"magento/module-integration": "100.2.*",

app/code/Magento/Authorization/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
5-
"php": "~7.1.0|~7.2.0",
5+
"php": "~7.0.13|~7.1.0|~7.2.0",
66
"magento/module-backend": "100.2.*",
77
"magento/framework": "101.0.*"
88
},

app/code/Magento/Authorizenet/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorizenet",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.0|~7.2.0",
5+
"php": "~7.0.13|~7.1.0|~7.2.0",
66
"magento/module-sales": "101.0.*",
77
"magento/module-store": "100.2.*",
88
"magento/module-quote": "101.0.*",

app/code/Magento/AuthorizenetAcceptjs/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "~7.1.0|~7.2.0",
8+
"php": "~7.0.13|~7.1.0|~7.2.0",
99
"magento/framework": "101.0.*",
1010
"magento/module-payment": "100.2.*",
1111
"magento/module-sales": "101.0.*",

app/code/Magento/AuthorizenetCardinal/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "~7.1.0|~7.2.0",
8+
"php": "~7.0.13|~7.1.0|~7.2.0",
99
"magento/module-authorizenet-acceptjs": "100.2.*",
1010
"magento/framework": "101.0.*",
1111
"magento/module-cardinal-commerce": "100.2.*",

app/code/Magento/Backend/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-backend",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.0|~7.2.0",
5+
"php": "~7.0.13|~7.1.0|~7.2.0",
66
"magento/module-store": "100.2.*",
77
"magento/module-directory": "100.2.*",
88
"magento/module-developer": "100.2.*",

app/code/Magento/Backup/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-backup",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.0|~7.2.0",
5+
"php": "~7.0.13|~7.1.0|~7.2.0",
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-cron": "100.2.*",

app/code/Magento/Braintree/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-braintree",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.0|~7.2.0",
5+
"php": "~7.0.13|~7.1.0|~7.2.0",
66
"magento/framework": "101.0.*",
77
"magento/magento-composer-installer": "*",
88
"magento/module-config": "101.0.*",

0 commit comments

Comments
 (0)