Skip to content

Commit

Permalink
Merge dev into mix
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasAFink committed Nov 29, 2023
2 parents d1313ee + e6951e9 commit 20a87a5
Show file tree
Hide file tree
Showing 23 changed files with 1,430 additions and 6,083 deletions.
5 changes: 3 additions & 2 deletions mellon/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"require-dev": {
"phpmd/phpmd": "^2.8.0",
"squizlabs/php_codesniffer": "*",
"phpunit/phpunit": "^9.5.4"
"phpunit/phpunit": "^9.5.4",
"roave/security-advisories": "dev-latest"
},
"require": {
"php": ">=7.0.0",
Expand All @@ -36,4 +37,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion zmsadmin/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],
"config": {
"platform": {
"php": "7.3"
"php": "8.0"
},
"allow-plugins": {
"php-http/discovery": true
Expand Down
Loading

0 comments on commit 20a87a5

Please sign in to comment.