Skip to content

Commit

Permalink
Merge pull request #87 from laminas-api-tools/2.0.x-merge-up-into-2.1…
Browse files Browse the repository at this point in the history
….x_ozL1nuEq

Merge release 2.0.1 into 2.1.x
  • Loading branch information
Ocramius authored Jun 7, 2022
2 parents 6c97eae + 7d05149 commit db57b30
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"require": {
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"laminas-api-tools/api-tools": "^1.4",
"laminas-api-tools/api-tools-admin-ui": "^1.3.9",
"laminas-api-tools/api-tools-admin-ui": "^2.0",
"laminas-api-tools/api-tools-api-problem": "^1.3",
"laminas-api-tools/api-tools-configuration": "^1.3.3",
"laminas-api-tools/api-tools-content-negotiation": "^1.4",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

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

0 comments on commit db57b30

Please sign in to comment.