diff options
| author | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
| commit | 0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3 (patch) | |
| tree | 7b88c388d526ada7b564f1faf44cda92276f2722 /package.json | |
| parent | f071549c8408241b88a95192e477816d2402eb6e (diff) | |
| parent | b31c35b63629ec750f338a646f6b730bd675b734 (diff) | |
| download | bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.tar.xz bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.zip | |
Merge branch 'master' into fix-13386
Conflicts:
js/carousel.js
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/package.json b/package.json index 8105591d7..c91de4403 100644 --- a/package.json +++ b/package.json @@ -30,34 +30,34 @@ "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" }, "devDependencies": { - "btoa": "~1.1.1", - "canonical-json": "~0.0.4", - "glob": "^4.0.0", - "grunt": "~0.4.4", - "grunt-autoprefixer": "~0.7.2", - "grunt-banner": "~0.2.2", + "btoa": "~1.1.2", + "glob": "~4.0.2", + "grunt": "~0.4.5", + "grunt-autoprefixer": "~0.7.6", + "grunt-banner": "~0.2.3", "grunt-contrib-clean": "~0.5.0", "grunt-contrib-concat": "~0.4.0", "grunt-contrib-connect": "~0.8.0", "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", - "grunt-contrib-cssmin": "~0.9.0", + "grunt-contrib-cssmin": "~0.10.0", "grunt-contrib-jade": "~0.12.0", "grunt-contrib-jshint": "~0.10.0", - "grunt-contrib-less": "~0.11.0", + "grunt-contrib-less": "~0.11.3", "grunt-contrib-qunit": "~0.5.1", - "grunt-contrib-uglify": "~0.4.0", + "grunt-contrib-uglify": "~0.5.0", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~2.0.1", "grunt-exec": "~0.4.5", - "grunt-html-validation": "~0.1.15", - "grunt-jekyll": "~0.4.1", - "grunt-jscs-checker": "~0.4.3", + "grunt-html-validation": "~0.1.18", + "grunt-jekyll": "~0.4.2", + "grunt-jscs-checker": "~0.5.1", "grunt-saucelabs": "~8.0.2", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.5.0", + "load-grunt-tasks": "~0.6.0", "markdown": "~0.5.0", - "time-grunt": "~0.3.1" + "npm-shrinkwrap": "~3.1.6", + "time-grunt": "~0.3.2" }, "engines": { "node": "~0.10.1" |