Merge branch '1.9.12.x'

This commit is contained in:
ccd0 2014-11-23 14:03:51 -08:00
commit eeeedab8b2

View File

@ -47,7 +47,7 @@
"grunt-contrib-concat": "0.5.0", "grunt-contrib-concat": "0.5.0",
"grunt-contrib-copy": "0.7.0", "grunt-contrib-copy": "0.7.0",
"grunt-contrib-watch": "0.6.1", "grunt-contrib-watch": "0.6.1",
"grunt-crx": "0.3.3", "grunt-crx": "0.3.4",
"grunt-markdown": "0.6.1", "grunt-markdown": "0.6.1",
"grunt-shell": "1.1.1", "grunt-shell": "1.1.1",
"load-grunt-tasks": "1.0.0" "load-grunt-tasks": "1.0.0"
@ -67,4 +67,4 @@
"engines": { "engines": {
"node": ">=0.10" "node": ">=0.10"
} }
} }