Commit 1e01e5b4 authored by Akikonata's avatar Akikonata

merge from dev

parents 138bba34 fdf7d32e
......@@ -2,7 +2,8 @@ git stash
git checkout gh-pages
git merge dev -m "merge from dev"
grunt
git commit -am "publish"
git add dist
git commit -m "publish"
git push origin gh-pages
git checkout dev
git stash pop
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment