Skip to content

Commit

Permalink
Merge branch 'php8-develop' into simplify-setup-wizard-2
Browse files Browse the repository at this point in the history
  • Loading branch information
hws47a committed Mar 18, 2021
2 parents 3f59e95 + 792958c commit b026746
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion app/code/Magento/Captcha/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"magento/module-customer": "*",
"magento/module-store": "*",
"magento/module-authorization": "*",
"laminas/laminas-captcha": "^2.7.1",
"laminas/laminas-captcha": "^2.10",
"laminas/laminas-db": "^2.8.2",
"laminas/laminas-session": "^2.10"
},
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"composer/composer": "^1.9 || ^2.0",
"elasticsearch/elasticsearch": "~7.11.0",
"guzzlehttp/guzzle": "^6.3.3",
"laminas/laminas-captcha": "^2.7.1",
"laminas/laminas-captcha": "^2.10",
"laminas/laminas-code": "^3.5.1",
"laminas/laminas-crypt": "^3.4.0",
"laminas/laminas-db": "^2.12.0",
Expand Down
44 changes: 23 additions & 21 deletions composer.lock

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

0 comments on commit b026746

Please sign in to comment.