Skip to content

Commit

Permalink
Merge pull request #900 from tractorcow-farm/7.2
Browse files Browse the repository at this point in the history
Merge up 7.2 to 7
  • Loading branch information
GuySartorelli authored Oct 22, 2024
2 parents f82f43d + 64b0c33 commit 208b365
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
"phpstan/extension-installer": "^1.3"
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
},
"expose": [
"client/dist"
]
Expand All @@ -73,4 +70,4 @@
"silverstripe/vendor-plugin": true
}
}
}
}

0 comments on commit 208b365

Please sign in to comment.