Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.12.x' into 2.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmirtes committed Sep 30, 2024
2 parents b41c19f + 0b9ce98 commit c7ecad5
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 @@ -22,7 +22,7 @@
"nette/php-generator": "3.6.9",
"nette/schema": "^1.2.2",
"nette/utils": "^3.2.5",
"nikic/php-parser": "^5.2.0",
"nikic/php-parser": "^5.3.0",
"ondram/ci-detector": "^3.4.0",
"ondrejmirtes/better-reflection": "6.42.0.9",
"phpstan/php-8-stubs": "0.3.111",
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 c7ecad5

Please sign in to comment.