diff options
| author | Mark Otto <[email protected]> | 2014-05-20 23:27:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-20 23:27:40 -0700 |
| commit | 707b362b801d7a430c1911493a65085e81b4ee8d (patch) | |
| tree | b659b23c3884e9100c1e800161e96110a0853294 /package.json | |
| parent | bdd822a94cdf2d452e067569e76ca1537dc74d8d (diff) | |
| parent | 3dd1531d81c90d6d1cf04962032f868d315ab21c (diff) | |
| download | bootstrap-707b362b801d7a430c1911493a65085e81b4ee8d.tar.xz bootstrap-707b362b801d7a430c1911493a65085e81b4ee8d.zip | |
Merge branch 'master' into docs-theme-toggler
Conflicts:
docs/assets/css/docs.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/package.json b/package.json index 4e4672959..823e743f8 100644 --- a/package.json +++ b/package.json @@ -49,12 +49,11 @@ "grunt-contrib-uglify": "~0.4.0", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~2.0.1", - "grunt-css-flip": "~0.2.2", "grunt-exec": "~0.4.5", "grunt-html-validation": "~0.1.15", "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.4.3", - "grunt-saucelabs": "~5.1.1", + "grunt-saucelabs": "~5.1.3", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.4.0", "markdown": "~0.5.0", |