Skip to content

Commit 1d2ffd5

Browse files
author
Stanislav Idolov
committed
Merge remote-tracking branch 'mainline/2.4.2-develop' into fix-file-extension-bug
2 parents 7d452d2 + 2742d15 commit 1d2ffd5

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

app/code/Magento/AwsS3/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"require": {
88
"php": "~7.3.0||~7.4.0",
9-
"magento/framework": "^100.0.2",
9+
"magento/framework": "*",
1010
"magento/module-remote-storage": "*",
1111
"league/flysystem": "^1.0",
1212
"league/flysystem-aws-s3-v3": "^1.0",

app/code/Magento/RemoteStorage/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.3.0||~7.4.0",
6-
"magento/framework": "^100.0.2"
6+
"magento/framework": "*"
77
},
88
"suggest": {
99
"magento/module-backend": "*",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
magento/module-aws-s3

0 commit comments

Comments
 (0)