salt/merge.sh

git checkout dev
git merge master
git push

git checkout master
git merge --squash dev
git commit
git push
git checkout dev
Added gitlab state, fixed sshfs and created symlink to secure 2017-08-21 20:30:08 +00:00			`git checkout dev`
			`git merge master`
			`git push`

initial commit 2017-08-07 13:25:01 -05:00			`git checkout master`
Added gitlab state, fixed sshfs and created symlink to secure 2017-08-21 20:30:08 +00:00			`git merge --squash dev`
			`git commit`
initial commit 2017-08-07 13:25:01 -05:00			`git push`
			`git checkout dev`