diff options
| author | Mark Otto <[email protected]> | 2014-06-25 16:57:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-25 16:57:22 -0700 |
| commit | 4045740c54504ede15f831c877f134752b6c12be (patch) | |
| tree | c3291b31e7dd119fbf43028300f49213e9912652 /package.json | |
| parent | e40df7cfacef0b581810c8ec661923054541638c (diff) | |
| parent | 4abb0957833c7158563244d1770ab9a5e6966150 (diff) | |
| download | bootstrap-4045740c54504ede15f831c877f134752b6c12be.tar.xz bootstrap-4045740c54504ede15f831c877f134752b6c12be.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
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 c91de4403..bd4c8a153 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,8 @@ "grunt-exec": "~0.4.5", "grunt-html-validation": "~0.1.18", "grunt-jekyll": "~0.4.2", - "grunt-jscs-checker": "~0.5.1", - "grunt-saucelabs": "~8.0.2", + "grunt-jscs-checker": "~0.6.0", + "grunt-saucelabs": "~8.1.0", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.6.0", "markdown": "~0.5.0", |