Skip to content

Commit 0576944

Browse files
committed
Merge branch 2.1.x into 2.2.x
2 parents b68702d + dbb0021 commit 0576944

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"hoa/compiler": "3.17.08.08",
2727
"hoa/exception": "^1.0",
2828
"hoa/file": "1.17.07.11",
29-
"jetbrains/phpstorm-stubs": "dev-master#fd1db82bb399e2cf3485c721337f45c398da5d12",
29+
"jetbrains/phpstorm-stubs": "dev-master#87940f228f9c3e6446e40d6cc3668f249fe871a5",
3030
"nette/bootstrap": "^3.0",
3131
"nette/di": "^3.1.4",
3232
"nette/neon": "3.3.4",

composer.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)