Merge branch 'bstable' into bbeta

This commit is contained in:
ccd0 2015-01-15 23:42:13 -08:00
commit 1ff3eb961c
3 changed files with 1721 additions and 15 deletions

View File

@ -241,6 +241,7 @@ module.exports = (grunt) ->
GM_getValue: true
GM_setValue: true
GM_deleteValue: true
GM_listValues: true
GM_openInTab: true
GM_info: true
GM_xmlhttpRequest: true

1704
npm-shrinkwrap.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -40,20 +40,21 @@
}
},
"devDependencies": {
"font-awesome": "4.2.0",
"grunt": "0.4.5",
"grunt-concurrent": "1.0.0",
"grunt-contrib-clean": "0.6.0",
"grunt-contrib-coffee": "0.12.0",
"grunt-contrib-compress": "0.13.0",
"grunt-contrib-concat": "0.5.0",
"grunt-contrib-copy": "0.7.0",
"grunt-contrib-jshint": "0.10.0",
"grunt-contrib-watch": "0.6.1",
"grunt-crx": "0.3.4",
"grunt-markdown": "0.7.0",
"grunt-shell": "1.1.1",
"load-grunt-tasks": "2.0.0"
"font-awesome": "^4.2.0",
"grunt": "^0.4.5",
"grunt-concurrent": "^1.0.0",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-coffee": "^0.12.0",
"grunt-contrib-compress": "^0.13.0",
"grunt-contrib-concat": "^0.5.0",
"grunt-contrib-copy": "^0.7.0",
"grunt-contrib-jshint": "^0.10.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-crx": "^0.3.4",
"grunt-markdown": "^0.7.0",
"grunt-shell": "^1.1.1",
"load-grunt-tasks": "^2.0.0",
"npm-shrinkwrap": "^5.1.0"
},
"repository": {
"type": "git",
@ -70,4 +71,4 @@
"engines": {
"node": ">=0.10"
}
}
}