Skip to content

Commit

Permalink
Merge branch 'updatephp8/laminas-laminas-view' 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 8cf6493 + 472d618 commit 93f2ab1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"laminas/laminas-text": "^2.6.0",
"laminas/laminas-uri": "^2.5.1",
"laminas/laminas-validator": "^2.6.0",
"laminas/laminas-view": "~2.11.2",
"laminas/laminas-view": "~2.12.0",
"league/flysystem": "^1.0",
"league/flysystem-aws-s3-v3": "^1.0",
"league/flysystem-cached-adapter": "^1.0",
Expand Down
27 changes: 16 additions & 11 deletions composer.lock

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

0 comments on commit 93f2ab1

Please sign in to comment.