diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2014-10-21 10:33:17 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2014-10-21 10:33:17 -0300 |
| commit | 2d14c4b384c7000e264674a92b16e010a510ac05 (patch) | |
| tree | 7676db09f338e46e053170b1c9f7594120b9d434 /bower_components/bootstrap/.bower.json | |
| parent | 2d2e97ac540c94e15ac5eccc7d32f3dfb3eea1bc (diff) | |
| parent | 5ec02211214350ee558fd9f6bb052264fd24f75e (diff) | |
Merge tag 'upstream/7.1.0'
Upstream version 7.1.0
Diffstat (limited to 'bower_components/bootstrap/.bower.json')
| -rw-r--r-- | bower_components/bootstrap/.bower.json | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/bower_components/bootstrap/.bower.json b/bower_components/bootstrap/.bower.json index 7222108..4325ed9 100644 --- a/bower_components/bootstrap/.bower.json +++ b/bower_components/bootstrap/.bower.json @@ -1,35 +1,48 @@ { "name": "bootstrap", - "version": "3.1.1", + "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", + "version": "3.2.0", + "keywords": [ + "css", + "js", + "less", + "mobile-first", + "responsive", + "front-end", + "framework", + "web" + ], + "homepage": "http://getbootstrap.com", "main": [ - "./dist/css/bootstrap.css", - "./dist/js/bootstrap.js", - "./dist/fonts/glyphicons-halflings-regular.eot", - "./dist/fonts/glyphicons-halflings-regular.svg", - "./dist/fonts/glyphicons-halflings-regular.ttf", - "./dist/fonts/glyphicons-halflings-regular.woff" + "less/bootstrap.less", + "dist/css/bootstrap.css", + "dist/js/bootstrap.js", + "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": [ - "**/.*", + ".*", "_config.yml", "CNAME", "composer.json", "CONTRIBUTING.md", "docs", - "js/tests" + "js/tests", + "test-infra" ], "dependencies": { "jquery": ">= 1.9.0" }, - "homepage": "https://github.com/twbs/bootstrap", - "_release": "3.1.1", + "_release": "3.2.0", "_resolution": { "type": "version", - "tag": "v3.1.1", - "commit": "a365d8689c3f3cee7f1acf86b61270ecca8e106d" + "tag": "v3.2.0", + "commit": "c068162161154a4b85110ea1e7dd3d7897ce2b72" }, "_source": "git://github.com/twbs/bootstrap.git", - "_target": "~3.1.1", + "_target": "~3.2.0", "_originalSource": "bootstrap", "_direct": true }
\ No newline at end of file |