diff options
| author | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
| commit | e9199718d64dadc22d61b4cea8c77a2307455823 (patch) | |
| tree | b10f0174a9d564da40df55d658136fef74b6adb9 /package.json | |
| parent | 4787a69efbe0fcd81228781b3c91dfe198aa0f1b (diff) | |
| parent | 7f88009394e72395aa7a458ae442b0c3037dbd15 (diff) | |
| download | bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.tar.xz bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.zip | |
Merge branch 'master' into fix-12154
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 | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/package.json b/package.json index 14d42ab7e..8e6c43494 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", - "version": "3.0.3", + "version": "3.1.0", "keywords": [ "bootstrap", "css" @@ -11,6 +11,8 @@ "scripts": { "test": "grunt test" }, + "style": "./dist/css/bootstrap.css", + "less": "./less/bootstrap.less", "repository": { "type": "git", "url": "https://github.com/twbs/bootstrap.git" @@ -18,14 +20,14 @@ "bugs": { "url": "https://github.com/twbs/bootstrap/issues" }, - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" - } - ], + "license": { + "type": "MIT", + "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" + }, "devDependencies": { + "browserstack-runner": "~0.1.0", "btoa": "~1.1.1", + "canonical-json": "~0.0.3", "grunt": "~0.4.2", "grunt-banner": "~0.2.0", "grunt-contrib-clean": "~0.5.0", @@ -37,16 +39,17 @@ "grunt-contrib-jade": "~0.9.1", "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-less": "~0.9.0", - "grunt-contrib-qunit": "~0.3.0", - "grunt-contrib-uglify": "~0.2.7", + "grunt-contrib-qunit": "~0.4.0", + "grunt-contrib-uglify": "~0.3.0", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~2.0.1", + "grunt-exec": "0.4.3", "grunt-html-validation": "~0.1.13", "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.3.0", - "grunt-saucelabs": "~4.1.2", + "grunt-saucelabs": "~5.0.0", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.2.1", + "load-grunt-tasks": "~0.3.0", "markdown": "~0.5.0" }, "jspm": { |