Skip to content

Commit

Permalink
Merge branch 'updatephp8/laminas-laminas-mime' of github.com:khrystyn…
Browse files Browse the repository at this point in the history
…astolbova/magento2 into php8-develop
  • Loading branch information
sivaschenko committed Mar 11, 2021
2 parents 872aa8e + 2e04851 commit aae4498
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 38 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"laminas/laminas-json": "^3.2.0",
"laminas/laminas-log": "^2.9.1",
"laminas/laminas-mail": "^2.9.0",
"laminas/laminas-mime": "^2.5.0",
"laminas/laminas-mime": "^2.8.0",
"laminas/laminas-modulemanager": "^2.7",
"laminas/laminas-mvc": "^3.2.0",
"laminas/laminas-mvc-console": "^1.3.0",
Expand Down
56 changes: 20 additions & 36 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"laminas/laminas-crypt": "^3.4.0",
"laminas/laminas-http": "^2.6.0",
"laminas/laminas-mail": "^2.9.0",
"laminas/laminas-mime": "^2.5.0",
"laminas/laminas-mime": "^2.8.0",
"laminas/laminas-mvc": "^3.2.0",
"laminas/laminas-stdlib": "^3.2.1",
"laminas/laminas-uri": "^2.5.1",
Expand Down

0 comments on commit aae4498

Please sign in to comment.