merge master

This commit is contained in:
Peter Cottle 2020-10-19 11:55:19 -06:00
commit 432ce09021

View file

@ -163,7 +163,7 @@ var gitDeployMergeMaster = function(done) {
};
var gitDeployPushOrigin = function(done) {
execSync('git commit -am "rebuild for prod" && ' +
execSync('git commit -am "rebuild for prod"; ' +
'git push origin gh-pages && ' +
'git branch -f trunk gh-pages && ' +
'git checkout master'