diff options
| author | Mark Otto <[email protected]> | 2014-07-11 00:38:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-11 00:38:28 -0700 |
| commit | cabb86d126584f48651431f431070dcf6bd9d76f (patch) | |
| tree | e6f2e8c5d7ba7fabdd54f48ac124466ffa308d62 /package.json | |
| parent | f6482aadcd8498f2dc82907994f8ec69afec8613 (diff) | |
| parent | c3ae289f4a9e5fc14e489e3914d150954469f1ac (diff) | |
| download | bootstrap-cabb86d126584f48651431f431070dcf6bd9d76f.tar.xz bootstrap-cabb86d126584f48651431f431070dcf6bd9d76f.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/_includes/components/progress-bars.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 234490b55..470b3585e 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "grunt-contrib-jade": "~0.12.0", "grunt-contrib-jshint": "~0.10.0", "grunt-contrib-less": "~0.11.3", - "grunt-contrib-qunit": "~0.5.1", + "grunt-contrib-qunit": "~0.5.2", "grunt-contrib-uglify": "~0.5.0", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~2.0.1", @@ -57,7 +57,7 @@ "load-grunt-tasks": "~0.6.0", "markdown": "~0.5.0", "npm-shrinkwrap": "~3.1.6", - "time-grunt": "~0.3.2" + "time-grunt": "~0.4.0" }, "engines": { "node": "~0.10.1" |