Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/it-at-m/eappointment into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
manjencic committed Nov 28, 2023
2 parents 427f1cf + 786ac18 commit e6951e9
Show file tree
Hide file tree
Showing 22 changed files with 1,068 additions and 1,004 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

## Import Database
- `ddev import-db --file=.resources/zms.sql`
- `ddev exec zmsapi/vendor/bin/migrate --update`
- `ddev exec zmsapi/vendor/bin/migrate --update`
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 e6951e9

Please sign in to comment.