diff options
| author | Mark Otto <[email protected]> | 2013-12-14 15:38:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 15:38:21 -0800 |
| commit | a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3 (patch) | |
| tree | 9b1c5697a731543a86711b016e1986ec1e81dad4 /bower.json | |
| parent | 80e86442308b2cc86ba948de87e854057933e3ab (diff) | |
| parent | f1869771bc8b8e8a6c7a98385ec58e0bf0d2d98e (diff) | |
| download | bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.tar.xz bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.zip | |
Merge branch 'master' into pr/10951
Conflicts:
dist/css/bootstrap.min.css
less/modals.less
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 0d03da6c9..313ff697f 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,25 @@ { "name": "bootstrap", - "version": "3.0.0", - "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" |