Merge branch 'pr/11778' into drop_recess_for_less
Conflicts: Gruntfile.js dist/css/bootstrap-theme.min.css dist/css/bootstrap.min.css
Showing
+27 -37
... | ... | @@ -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" | ||
... | ... |
Please register or sign in to comment