diff options
| author | Mark Otto <[email protected]> | 2013-11-30 00:55:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 00:55:00 -0800 |
| commit | 080aa7f5c8557b232005cb947df51968d4629656 (patch) | |
| tree | e546cc3ec229d201751e426da36a1b2a586ee428 /package.json | |
| parent | 441f9d67179f766377eed4b0cedc5dc6eec290e4 (diff) | |
| parent | 819e920d1646f7e9fec8d3dd6ba10dcbd2fa1599 (diff) | |
| download | bootstrap-080aa7f5c8557b232005cb947df51968d4629656.tar.xz bootstrap-080aa7f5c8557b232005cb947df51968d4629656.zip | |
Merge branch 'master' into pr/11299
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/package.json b/package.json index 46266fe0d..009b7bf58 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.1" + , "version": "3.0.2" , "keywords": ["bootstrap", "css"] , "homepage": "http://getbootstrap.com" , "author": "Twitter, Inc." @@ -33,6 +33,19 @@ , "grunt-contrib-watch": "~0.5.3" , "grunt-html-validation": "~0.1.6" , "grunt-jekyll": "~0.4.0" - , "grunt-recess": "~0.4.0" + , "grunt-recess": "~0.5.0" + , "grunt-sed": "~0.1.1" + , "regexp-quote": "~0.0.0" + } + , "jspm": { + "main": "js/bootstrap" + , "directories": { "lib": "dist" } + , "shim": { + "js/bootstrap": { + "imports": "jquery" + , "exports": "$" + } + } + , "buildConfig": { "uglify": true } } } |