Skip to content

Commit

Permalink
Merge branch '5.0' into 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lcharette committed Mar 23, 2024
2 parents b28a1ea + 3c80a41 commit 14c64ae
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"require": {
"php": "^8.1",
"ext-gd": "*",
"userfrosting/framework": "^5.1@dev",
"userfrosting/sprinkle-core": "^5.1@dev",
"userfrosting/sprinkle-account": "^5.1@dev",
"userfrosting/sprinkle-admin": "^5.1@dev",
"userfrosting/theme-adminlte": "^5.1@dev"
"userfrosting/framework": "~5.1.0",
"userfrosting/sprinkle-core": "~5.1.0",
"userfrosting/sprinkle-account": "~5.1.0",
"userfrosting/sprinkle-admin": "~5.1.0",
"userfrosting/theme-adminlte": "~5.1.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.0",
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

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

0 comments on commit 14c64ae

Please sign in to comment.