Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Smie Grin 2016-01-18 07:39:31 -07:00
commit e8f6bcee63

View File

@ -20,7 +20,7 @@
"grunt-contrib-concat": "0.5.1",
"grunt-contrib-connect": "0.11.2",
"grunt-contrib-copy": "0.8.0",
"grunt-contrib-jshint": "0.11.1",
"grunt-contrib-jshint": "0.12.0",
"grunt-contrib-uglify": "0.11.0",
"grunt-contrib-watch": "0.6.1",
"grunt-ghost": "1.1.0",