Skip to content

Commit

Permalink
Merge branch '9.x' into 10.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
#	src/Illuminate/Auth/composer.json
#	src/Illuminate/Broadcasting/composer.json
#	src/Illuminate/Console/composer.json
#	src/Illuminate/Cookie/composer.json
#	src/Illuminate/Database/composer.json
#	src/Illuminate/Encryption/composer.json
#	src/Illuminate/Http/composer.json
#	src/Illuminate/Mail/composer.json
#	src/Illuminate/Pagination/composer.json
#	src/Illuminate/Queue/composer.json
#	src/Illuminate/Routing/composer.json
#	src/Illuminate/Session/composer.json
#	src/Illuminate/Support/composer.json
#	src/Illuminate/Testing/composer.json
#	src/Illuminate/Translation/composer.json
#	src/Illuminate/Validation/composer.json
#	src/Illuminate/View/composer.json
  • Loading branch information
driesvints committed Feb 7, 2023
2 parents 4492b8c + 35f9ce1 commit 3729e69
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
],
"require": {
"php": "^8.1",
"ext-hash": "*",
"illuminate/collections": "^10.0",
"illuminate/contracts": "^10.0",
"illuminate/http": "^10.0",
Expand Down

0 comments on commit 3729e69

Please sign in to comment.