Merge branch '4' into 5

This commit is contained in:
Guy Sartorelli 2024-08-05 14:53:39 +12:00
commit 7ab370a953
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
2 changed files with 1 additions and 3 deletions

View File

@ -25,9 +25,6 @@
"silverstripe/asset-admin": "^3" "silverstripe/asset-admin": "^3"
}, },
"extra": { "extra": {
"branch-alias": {
"dev-master": "4.x-dev"
},
"expose": [ "expose": [
"client/dist", "client/dist",
"client/lang" "client/lang"

View File

@ -13,6 +13,7 @@ en:
EDIT_SELECT_LABEL: Edit EDIT_SELECT_LABEL: Edit
PUBLISH_SELECT_LABEL: Publish PUBLISH_SELECT_LABEL: Publish
SELECT_ALL_LABEL: 'Select all' SELECT_ALL_LABEL: 'Select all'
SELECT_LABEL: Select
UNLINK_SELECT_LABEL: Unlink UNLINK_SELECT_LABEL: Unlink
UNPUBLISH_SELECT_LABEL: UnPublish UNPUBLISH_SELECT_LABEL: UnPublish
GRIDFIELD_BULK_UPLOAD: null GRIDFIELD_BULK_UPLOAD: null