Skip to content

Commit

Permalink
Merge branch '1.7.x' into 1.8.x
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmirtes committed Jun 29, 2022
2 parents 63e7e2c + 45d951a commit 59fb0a3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"hoa/exception": "^1.0",
"hoa/regex": "1.17.01.13",
"jean85/pretty-package-versions": "^1.0.3",
"jetbrains/phpstorm-stubs": "dev-master#23d2387e93359e468f676817d8bc31aa6dbe45ef",
"jetbrains/phpstorm-stubs": "dev-master#d9c383ec1e68b13d370507063431e10efeb93f1f",
"nette/bootstrap": "^3.0",
"nette/di": "^3.0.11",
"nette/finder": "^2.5",
Expand Down
10 changes: 5 additions & 5 deletions composer.lock

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

0 comments on commit 59fb0a3

Please sign in to comment.