diff options
| author | Mark Otto <[email protected]> | 2013-12-01 20:27:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-01 20:27:30 -0800 |
| commit | 4876cbeef8c79686ba31c3ed22771357d71dbe51 (patch) | |
| tree | 79fed0fbb2a96fad2247c3014a045e655d1a825e /package.json | |
| parent | 1444a3ca638bd8661c0019560117ac75aace3402 (diff) | |
| parent | 561aff7942d9adfc9508232789e2598406f80934 (diff) | |
| download | bootstrap-4876cbeef8c79686ba31c3ed22771357d71dbe51.tar.xz bootstrap-4876cbeef8c79686ba31c3ed22771357d71dbe51.zip | |
Merge branch 'master' into pr/11412
Conflicts:
dist/js/bootstrap.min.js
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/package.json b/package.json index 9d4912d53..bc2a004af 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.2" + , "version": "3.0.3" , "keywords": ["bootstrap", "css"] , "homepage": "http://getbootstrap.com" , "author": "Twitter, Inc." @@ -33,8 +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 } + } } |