merge from dev

1e01e5b4 · Akikonata · 138bba34 · fdf7d32e · 1e01e5b4
Commit 1e01e5b4 authored Mar 18, 2014 by Akikonata
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

publish publish +2 -1

No files found.
--- a/publish
+++ b/publish
@@ -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