Merge branch '4.2' into 4

2021-05-21 13:48:10 +12:00 · 2021-05-21 13:48:10 +12:00 · c15888277d
parent fa031262fb f3d7a396e3
commit c15888277d
1 changed files with 1 additions and 4 deletions
--- a/composer.json
+++ b/composer.json
@ -37,9 +37,6 @@
        "symbiote/silverstripe-queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created"
    },
    "extra": {
-        "branch-alias": {
-            "dev-master": "4.x-dev"
-        },
        "expose": [
            "client/dist"
        ]
@ -52,4 +49,4 @@
    },
    "minimum-stability": "dev",
    "prefer-stable": true
-}
+}