diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2015-07-08 07:35:06 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2015-07-08 07:35:06 -0300 |
| commit | 055d72d76b44b0e627c8a17c48dbecd62e44197b (patch) | |
| tree | e2c8d5475477c46115461fe9547c1ee797873635 /bower_components/bootstrap/.bower.json | |
| parent | 61f3aad02cd6492cb38e41b66f2ed8ec56e98981 (diff) | |
| parent | b0b24795b24ee6809397fbbadf42f31f310a219f (diff) | |
Merge tag 'upstream/7.6.0'
Upstream version 7.6.0
Diffstat (limited to 'bower_components/bootstrap/.bower.json')
| -rw-r--r-- | bower_components/bootstrap/.bower.json | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/bower_components/bootstrap/.bower.json b/bower_components/bootstrap/.bower.json index 4325ed9..7fde9e3 100644 --- a/bower_components/bootstrap/.bower.json +++ b/bower_components/bootstrap/.bower.json @@ -1,7 +1,6 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "3.2.0", "keywords": [ "css", "js", @@ -13,17 +12,14 @@ "web" ], "homepage": "http://getbootstrap.com", + "license": "MIT", + "moduleType": "globals", "main": [ "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" + "dist/js/bootstrap.js" ], "ignore": [ - ".*", + "/.*", "_config.yml", "CNAME", "composer.json", @@ -33,16 +29,16 @@ "test-infra" ], "dependencies": { - "jquery": ">= 1.9.0" + "jquery": ">= 1.9.1" }, - "_release": "3.2.0", + "version": "3.3.5", + "_release": "3.3.5", "_resolution": { "type": "version", - "tag": "v3.2.0", - "commit": "c068162161154a4b85110ea1e7dd3d7897ce2b72" + "tag": "v3.3.5", + "commit": "16b48259a62f576e52c903c476bd42b90ab22482" }, "_source": "git://github.com/twbs/bootstrap.git", - "_target": "~3.2.0", - "_originalSource": "bootstrap", - "_direct": true + "_target": "~3.3.4", + "_originalSource": "bootstrap" }
\ No newline at end of file |