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 /bower.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 'bower.json')
| -rw-r--r-- | bower.json | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/bower.json b/bower.json index ed210a01f..02bd14c6d 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/*"], + "version": "3.0.3", + "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" |