diff options
| author | Mark Otto <[email protected]> | 2014-06-08 13:57:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-08 13:57:44 -0700 |
| commit | d1872b4c98f26b1bfcd7e007133b97e6602dd0d0 (patch) | |
| tree | ccc12bda1d6df512fbc9c4023b296f46a6f05e3f /package.json | |
| parent | 5872a7e0aca5e2b5b8e0be5df8b2a7cdf987d805 (diff) | |
| parent | 5cd72ce23058b47a739c7e2005ab5c3d4e28ff30 (diff) | |
| download | bootstrap-d1872b4c98f26b1bfcd7e007133b97e6602dd0d0.tar.xz bootstrap-d1872b4c98f26b1bfcd7e007133b97e6602dd0d0.zip | |
Merge branch 'master' into pr/13736
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index bedbd1334..97ed639eb 100644 --- a/package.json +++ b/package.json @@ -42,10 +42,10 @@ "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", "grunt-contrib-cssmin": "~0.9.0", - "grunt-contrib-jade": "~0.11.0", + "grunt-contrib-jade": "~0.12.0", "grunt-contrib-jshint": "~0.10.0", "grunt-contrib-less": "~0.11.0", - "grunt-contrib-qunit": "~0.4.0", + "grunt-contrib-qunit": "~0.5.1", "grunt-contrib-uglify": "~0.4.0", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~2.0.1", @@ -53,7 +53,7 @@ "grunt-html-validation": "~0.1.15", "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.4.3", - "grunt-saucelabs": "~7.0.0", + "grunt-saucelabs": "~8.0.2", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.4.0", "markdown": "~0.5.0", |