]> BookStack Code Mirror - devops/blobdiff - meta-scripts/bookstack-release-steps
Renamed old primary branch references
[devops] / meta-scripts / bookstack-release-steps
index 3798e6ad97c96670fef3578b8c51b97194f5a8ed..83f00223dab797144302f30e59f2b4258ad85796 100755 (executable)
@@ -12,9 +12,9 @@ echo "bookstack-update-translators"
 echo "git commit -a -m \"Updated translator attribution before release ${version}\""
 echo ""
 
-echo -e "\e[1m\e[94m== Merge codebase from master ==\e[0m"
+echo -e "\e[1m\e[94m== Merge codebase from development ==\e[0m"
 echo "git checkout release"
-echo "git merge master"
+echo "git merge development"
 echo ""
 
 echo -e "\e[1m\e[94m== Builds deps and increment version ==\e[0m"