Merge branch '4.2' into 4

This commit is contained in:
Steve Boyd 2021-05-21 13:48:10 +12:00
commit c15888277d

View File

@ -37,9 +37,6 @@
"symbiote/silverstripe-queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created" "symbiote/silverstripe-queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created"
}, },
"extra": { "extra": {
"branch-alias": {
"dev-master": "4.x-dev"
},
"expose": [ "expose": [
"client/dist" "client/dist"
] ]