Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.next-cake5' into 3.next-cake5
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
  • Loading branch information
arusinowski committed Sep 30, 2023
2 parents 8fe2600 + 717bb01 commit 9169b64
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
"cakephp/cakephp-codesniffer": "^5.0",
"cakephp/bake": "^3.0.0",
"cakephp/migrations": "^4.0.0",
"aura/intl": "^3.0",
"vimeo/psalm": "^5.15",
"phpstan/phpstan": "^1.10"
"aura/intl": "^3.0"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 9169b64

Please sign in to comment.