Merge branch 'bstable'

This commit is contained in:
ccd0 2015-02-22 09:09:17 -08:00
commit 3c67af32d0
2 changed files with 9 additions and 5 deletions

12
npm-shrinkwrap.json generated
View File

@ -536,8 +536,8 @@
}
},
"grunt-contrib-copy": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-0.7.0.tgz",
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-0.8.0.tgz",
"dependencies": {
"chalk": {
"version": "0.5.1",
@ -548,8 +548,8 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
},
"escape-string-regexp": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
},
"has-ansi": {
"version": "0.1.0",
@ -576,6 +576,10 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
}
}
},
"file-sync-cmp": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz"
}
}
},

View File

@ -48,7 +48,7 @@
"grunt-contrib-coffee": "^0.12.0",
"grunt-contrib-compress": "^0.13.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "^0.7.0",
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-crx": "^0.3.4",