Merge branch '1.9.7.x'

This commit is contained in:
ccd0 2014-10-18 17:01:53 -07:00
commit 2700afe9d7

View File

@ -45,7 +45,7 @@
"grunt-contrib-coffee": "0.12.0",
"grunt-contrib-compress": "0.12.0",
"grunt-contrib-concat": "0.5.0",
"grunt-contrib-copy": "0.6.0",
"grunt-contrib-copy": "0.7.0",
"grunt-contrib-watch": "0.6.1",
"grunt-crx": "0.3.3",
"grunt-markdown": "0.6.1",
@ -67,4 +67,4 @@
"engines": {
"node": ">=0.10"
}
}
}