diff options
| author | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
| commit | bb4a39d51cd644b212323a7e36f0b5af2682d0ca (patch) | |
| tree | 60ae6687f516cea501f32f5623a5c0aacb950772 /bower.json | |
| parent | 96109d3138fd6f5b67fb1108754e81c077630b36 (diff) | |
| parent | e6eb798178529cf58fab3f33446c0170bae7bdea (diff) | |
| download | bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.tar.xz bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.zip | |
Merge branch 'master' into pr/11388
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/bower.json b/bower.json index ed210a01f..bf60a5113 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,28 @@ { "name": "bootstrap", "version": "3.0.2", - "main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"], + "main": [ + "./dist/js/bootstrap.js", + "./dist/css/bootstrap.css", + "./dist/fonts/glyphicons-halflings-regular.eot", + "./dist/fonts/glyphicons-halflings-regular.svg", + "./dist/fonts/glyphicons-halflings-regular.ttf", + "./dist/fonts/glyphicons-halflings-regular.woff" + ], "ignore": [ - "**/.*" + "**/.*", + "_*", + "docs-assets", + "examples", + "/fonts", + "js/tests", + "CNAME", + "CONTRIBUTING.md", + "Gruntfile.js", + "browserstack.json", + "composer.json", + "package.json", + "*.html" ], "dependencies": { "jquery": ">= 1.9.0" |