Skip to content

Commit

Permalink
Merge branch '7.x' into 8.x
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <[email protected]>
  • Loading branch information
crynobone committed Aug 22, 2024
2 parents 892f2d1 + f88767d commit e19df54
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
/bin export-ignore
/workbench export-ignore
/.github export-ignore
/.coveralls.yml export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.gitmodules export-ignore
/.travis.yml export-ignore
/phpunit9.xml export-ignore
/phpunit.xml export-ignore
/testbench.yaml export-ignore
/CHANGELOG-*.md export-ignore
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"fakerphp/faker": "^1.21",
"laravel/framework": "^10.48.20",
"mockery/mockery": "^1.5.1",
"orchestra/testbench-core": "^8.26",
"orchestra/testbench-core": "^8.27",
"orchestra/workbench": "^8.9",
"phpunit/phpunit": "^9.6 || ^10.1",
"symfony/process": "^6.2",
Expand Down

0 comments on commit e19df54

Please sign in to comment.