diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:46:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:46:40 -0800 |
| commit | 4c64c1eecdb52d943a50d2c181aeb915a3caed34 (patch) | |
| tree | 93b556ef583bb6a327cad76804bbdf4c5a4c6f4c /bower.json | |
| parent | 2b56ff04614c4617355d16c14784654e841bcf4d (diff) | |
| parent | d79431ca02683c9d1c754201260f66e5dda15614 (diff) | |
| download | bootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.tar.xz bootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.zip | |
Merge branch 'master' into pr/11302
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/bower.json b/bower.json index b5b393003..313ff697f 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,25 @@ { "name": "bootstrap", - "version": "3.0.1", - "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", + "composer.json", + "*.html" ], "dependencies": { "jquery": ">= 1.9.0" |