Merge branch '4' into 5

silverstripe · Aug 5, 2024 · 7ab370a · 7ab370a
2 parents e525d3d + 50e092d
commit 7ab370a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -25,9 +25,6 @@
         "silverstripe/asset-admin": "^3"
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "4.x-dev"
-        },
         "expose": [
             "client/dist",
             "client/lang"

diff --git a/lang/en.yml b/lang/en.yml
@@ -13,6 +13,7 @@ en:
     EDIT_SELECT_LABEL: Edit
     PUBLISH_SELECT_LABEL: Publish
     SELECT_ALL_LABEL: 'Select all'
+    SELECT_LABEL: Select
     UNLINK_SELECT_LABEL: Unlink
     UNPUBLISH_SELECT_LABEL: UnPublish
   GRIDFIELD_BULK_UPLOAD: null