Merge branch '1.9.4.x'

This commit is contained in:
ccd0 2014-09-28 13:55:02 -07:00
commit f3f27f8eff
2 changed files with 3 additions and 3 deletions

View File

@ -105,7 +105,7 @@ module.exports = (grunt) ->
expand: true expand: true
filter: (src) -> filter: (src) ->
pkg = grunt.config 'pkg' pkg = grunt.config 'pkg'
grunt.file.isFile(src) and src isnt "testbuilds/#{pkg.name}#{pkg.meta.suffix.dev}.user.js" grunt.file.isFile(src) and !grunt.file.isMatch(src, "testbuilds/#{pkg.name}#{pkg.meta.suffix.dev}.user.js")
coffee: coffee:
script: script:

View File

@ -42,9 +42,9 @@
"grunt-concurrent": "1.0.0", "grunt-concurrent": "1.0.0",
"grunt-contrib-clean": "0.6.0", "grunt-contrib-clean": "0.6.0",
"grunt-contrib-coffee": "0.11.1", "grunt-contrib-coffee": "0.11.1",
"grunt-contrib-compress": "0.11.0", "grunt-contrib-compress": "0.12.0",
"grunt-contrib-concat": "0.5.0", "grunt-contrib-concat": "0.5.0",
"grunt-contrib-copy": "0.5.0", "grunt-contrib-copy": "0.6.0",
"grunt-contrib-watch": "0.6.1", "grunt-contrib-watch": "0.6.1",
"grunt-crx": "0.3.3", "grunt-crx": "0.3.3",
"grunt-shell": "1.1.1", "grunt-shell": "1.1.1",