diff options
| author | Mark Otto <[email protected]> | 2013-11-30 23:35:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 23:35:56 -0800 |
| commit | 53047fa587fc8ca5cc0cad751f71fca5470d453a (patch) | |
| tree | a013806bef23a01e7ff0615f82b629703c553d6a /package.json | |
| parent | ba4c5dae9b8e34e90e86ba28aa6bd5acf3351f0d (diff) | |
| parent | 57070dcf4525fe82cab6a93300861867aa7f2d1e (diff) | |
| download | bootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.tar.xz bootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.zip | |
Merge branch 'master' into pr/11536
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/package.json b/package.json index 9d4912d53..009b7bf58 100644 --- a/package.json +++ b/package.json @@ -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 } + } } |