diff options
| author | Mark Otto <[email protected]> | 2013-11-30 13:09:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 13:09:55 -0800 |
| commit | 82bbccde9bc91543e7b1a4612d4d87c75c737bba (patch) | |
| tree | e8abb61d6f8d58b20481e2704e5782cf3af1427f /package.json | |
| parent | 702ad4c3025c8db0ec482e5eccd339cf1e6c2a5a (diff) | |
| parent | 56113201017cc15bc677a99f61730b2a34cac2a5 (diff) | |
| download | bootstrap-82bbccde9bc91543e7b1a4612d4d87c75c737bba.tar.xz bootstrap-82bbccde9bc91543e7b1a4612d4d87c75c737bba.zip | |
Merge branch 'master' into pr/11648
Conflicts:
dist/css/bootstrap.min.css
less/grid.less
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/package.json b/package.json index 12df3477c..009b7bf58 100644 --- a/package.json +++ b/package.json @@ -37,4 +37,15 @@ , "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 } + } } |