diff options
| author | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
| commit | 8551f42ae2935c96bd37ae8ed15198a0cc22ede2 (patch) | |
| tree | 77498aad62c25da55fb121470d91623c14873f58 /package.json | |
| parent | b36d19c3c6caf89fbe996678bdefe3f7e9a69281 (diff) | |
| parent | 2cef0af211e8b6780fff90fe5f110493585aa97c (diff) | |
| download | bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.tar.xz bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.zip | |
Merge branch 'master' into pr/12412
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package.json b/package.json index 40c4a81bb..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,12 @@ "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.0.15", + "browserstack-runner": "~0.1.0", "btoa": "~1.1.1", "canonical-json": "~0.0.3", "grunt": "~0.4.2", @@ -47,7 +47,7 @@ "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.3.0", "markdown": "~0.5.0" |