Modify release script from 1.x

scripts/deploy-gh.sh

@@ -4,7 +4,7 @@
 
 git checkout gh-pages
 git pull
-git merge master --no-edit
+git merge 1.x --no-edit
 
 # update bower_components
 git rm -rf bower_components
@@ -26,4 +26,4 @@ fi
 
 # push and return to master!
 git push
-git checkout master
+git checkout 1.x

scripts/deploy.sh

@@ -64,7 +64,7 @@ set -e
 git tag -am "Release v$version." "v$version"
 
 # swap back to the clean master and push the new tag
-git checkout master
+git checkout 1.x
 git push --tags
 # now the published tag contains build files which work great with bower.
 

scripts/pre-deploy.sh

@@ -10,7 +10,7 @@ NC='\033[0m' # No Color
 type jq >/dev/null 2>&1 || { echo >&2 "I require jq but it's not installed.  Aborting."; exit 1; }
 
 # 0.2 check if on master
-if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
+if [ "$(git rev-parse --abbrev-ref HEAD)" != "1.x" ]; then
   echo "${RED}Not on master, please checkout master branch before running this script${NC}"
   exit 1
 fi