diff options
| author | Mark Otto <[email protected]> | 2013-12-08 23:48:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-08 23:48:07 -0800 |
| commit | ea61a19a04e3bcd96f1dc0960375d926bb1dabb5 (patch) | |
| tree | 4d3f573abfa96ed0465492f52d70d7e2b6e767a8 /package.json | |
| parent | 0016c17f9307bc71fc96d8d4680a9c861f137cae (diff) | |
| parent | fdc5d1dc34bf28e55c6359aeb098e608585ca6cb (diff) | |
| download | bootstrap-ea61a19a04e3bcd96f1dc0960375d926bb1dabb5.tar.xz bootstrap-ea61a19a04e3bcd96f1dc0960375d926bb1dabb5.zip | |
Merge branch 'pr/11778' into drop_recess_for_less
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json index a69639ca2..0d414000f 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-cssmin": "~0.7.0" , "grunt-contrib-jshint": "~0.7.0" , "grunt-contrib-less": "~0.8.0" , "grunt-contrib-qunit": "~0.3.0" |