Merge branch 'bstable'

Conflicts:
	Gruntfile.coffee
This commit is contained in:
ccd0 2015-03-06 19:02:33 -08:00
commit 5a88ebea5e

View File

@ -143,7 +143,6 @@ module.exports = (grunt) ->
""".split('\n').join('&&')
beta:
command: """
git fetch --tags
git tag -af beta -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
git checkout gh-pages
git pull
@ -154,7 +153,6 @@ module.exports = (grunt) ->
""".split('\n').join('&&')
stable:
command: """
git fetch --tags
git tag -af stable -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
git checkout gh-pages
git pull
@ -168,7 +166,6 @@ module.exports = (grunt) ->
command: 'git commit -am "Build web page."'
web:
command: """
git fetch --tags
git checkout gh-pages
git pull
git merge --no-commit -s ours -