aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-08 23:56:22 -0800
committerMark Otto <[email protected]>2013-12-08 23:56:22 -0800
commitde218bbba83b83f96f62b689a56b18b3ebcd191e (patch)
tree5eb4c58adec10c3bb98cc6d306e80887b7f2e6d3 /package.json
parentea61a19a04e3bcd96f1dc0960375d926bb1dabb5 (diff)
parentcbfbf1b2dd16b1aa17e3feef9a4643e98a0f967e (diff)
downloadbootstrap-de218bbba83b83f96f62b689a56b18b3ebcd191e.tar.xz
bootstrap-de218bbba83b83f96f62b689a56b18b3ebcd191e.zip
Merge branch 'pr/11779' into drop_recess_for_less
Conflicts: Gruntfile.js package.json
Diffstat (limited to 'package.json')
-rw-r--r--package.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json
index 0d414000f..5cd7c90ec 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
, "grunt-contrib-concat": "~0.3.0"
, "grunt-contrib-connect": "~0.5.0"
, "grunt-contrib-copy": "~0.4.1"
+ , "grunt-contrib-csslint": "~0.2.0"
, "grunt-contrib-cssmin": "~0.7.0"
, "grunt-contrib-jshint": "~0.7.0"
, "grunt-contrib-less": "~0.8.0"