diff options
| author | Mark Otto <[email protected]> | 2014-11-11 19:25:16 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-11-11 19:25:16 -0800 |
| commit | 1e268ddfc30def5f4b2b0f2ace34b7de549ea830 (patch) | |
| tree | 7cc63bc43a6c3b603cef4f004a2285e5c034a710 /package.json | |
| parent | 4f6aeaa6347725436296131c4d2b059243390a04 (diff) | |
| parent | 001d5e00c58bbb8e4d34c085c5b27b214a475bd5 (diff) | |
| download | bootstrap-1e268ddfc30def5f4b2b0f2ace34b7de549ea830.tar.xz bootstrap-1e268ddfc30def5f4b2b0f2ace34b7de549ea830.zip | |
Merge branch 'master' into labels-readme
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index f52ca15f8..9fb35fa8c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "3.2.0", + "version": "3.3.0", "keywords": [ "css", "less", @@ -38,7 +38,7 @@ "grunt-banner": "~0.2.3", "grunt-contrib-clean": "~0.6.0", "grunt-contrib-concat": "~0.5.0", - "grunt-contrib-connect": "~0.8.0", + "grunt-contrib-connect": "~0.9.0", "grunt-contrib-copy": "~0.7.0", "grunt-contrib-csslint": "~0.3.1", "grunt-contrib-cssmin": "~0.10.0", @@ -56,8 +56,8 @@ "grunt-saucelabs": "~8.3.2", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~1.0.0", - "npm-shrinkwrap": "~4.0.0", - "remarkable": "^1.2.0", + "npm-shrinkwrap": "~4.1.1", + "remarkable": "~1.4.0", "time-grunt": "~1.0.0" }, "engines": { |