Skip to content

Commit cc4eb92

Browse files
committed
Merge remote-tracking branch 'origin/1.12.x' into 2.0.x
2 parents f0b1080 + b744041 commit cc4eb92

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Diff for: composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"composer/ca-bundle": "^1.2",
1212
"composer/semver": "^3.4",
1313
"composer/xdebug-handler": "^3.0.3",
14-
"fidry/cpu-core-counter": "^0.5.0",
14+
"fidry/cpu-core-counter": "^1.2",
1515
"hoa/compiler": "3.17.08.08",
1616
"hoa/exception": "^1.0",
1717
"hoa/file": "1.17.07.11",

Diff for: composer.lock

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)