Merge branch 'master' of github.com:sapegin/dotfiles

Conflicts: sublime/User/Package Control.sublime-settings sublime/User/Preferences.sublime-settings
2013-08-08 13:32:54 +04:00
parent 98329a11c4 77adeaf75a
commit c271a8f99b
6 changed files with 151 additions and 29 deletions
--- a/bin/release
+++ b/bin/release
@ -95,7 +95,7 @@ if [ -n "$jq_ver" ]; then
 fi

 # Build files
-[ -f Gruntfile.js ] && grunt build
+[ -f Gruntfile.js ] || [ -f Gruntfile.coffee ] && grunt build
 if [ -f src/Gruntfile.js ]; then
 	pushd src
 	grunt build