Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts: # app/tasks/maintenance.php
This commit is contained in:
commit
31bd5cbeda
1 changed files with 1 additions and 1 deletions
2
composer.lock
generated
2
composer.lock
generated
|
@ -5390,5 +5390,5 @@
|
|||
"platform-overrides": {
|
||||
"php": "8.0"
|
||||
},
|
||||
"plugin-api-version": "2.3.0"
|
||||
"plugin-api-version": "2.2.0"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue