diff options
| author | Mark Otto <[email protected]> | 2014-08-27 22:38:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-08-27 22:38:46 -0700 |
| commit | f4eefd28d10198ea60ce4069c00236e74cda1bf5 (patch) | |
| tree | 9141bf9c907a2bf7962ca5abdb6f0c8496d8b1ad /package.json | |
| parent | dfa2759a52e73e720b0cda302a1edb9e2dbebc1f (diff) | |
| parent | 1ebc7e62a8672c59c3bd886bc71ca90e9571d1bc (diff) | |
| download | bootstrap-f4eefd28d10198ea60ce4069c00236e74cda1bf5.tar.xz bootstrap-f4eefd28d10198ea60ce4069c00236e74cda1bf5.zip | |
Merge branch 'master' into sr_friendly_hidden_content
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package.json b/package.json index 00c9be7cd..8f406346a 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ }, "devDependencies": { "btoa": "~1.1.2", - "glob": "~4.0.4", + "glob": "~4.0.5", "grunt": "~0.4.5", - "grunt-autoprefixer": "~1.0.0", + "grunt-autoprefixer": "~1.0.1", "grunt-banner": "~0.2.3", "grunt-contrib-clean": "~0.6.0", "grunt-contrib-concat": "~0.5.0", @@ -43,21 +43,21 @@ "grunt-contrib-cssmin": "~0.10.0", "grunt-contrib-jade": "~0.12.0", "grunt-contrib-jshint": "~0.10.0", - "grunt-contrib-less": "~0.11.3", + "grunt-contrib-less": "~0.11.4", "grunt-contrib-qunit": "~0.5.2", - "grunt-contrib-uglify": "~0.5.0", + "grunt-contrib-uglify": "~0.5.1", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~3.0.0", "grunt-exec": "~0.4.6", "grunt-html-validation": "~0.1.18", "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~0.6.1", - "grunt-saucelabs": "~8.2.0", + "grunt-jscs": "~0.6.2", + "grunt-saucelabs": "~8.3.1", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.6.0", "markdown": "~0.5.0", - "npm-shrinkwrap": "~3.1.6", - "time-grunt": "~0.4.0" + "npm-shrinkwrap": "~3.1.8", + "time-grunt": "~1.0.0" }, "engines": { "node": "~0.10.1" |