diff options
| author | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
| commit | ef5d8e98e2e9aa87496eef8359667f7e052ae636 (patch) | |
| tree | 0d202235247562f094df841960170b1245ea728b /bower.json | |
| parent | dc5917bedfda321b72310209d2807ea10347f7ed (diff) | |
| parent | e4d13e238d0d6ea241f4e77328f6551206d17362 (diff) | |
| download | bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.tar.xz bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.zip | |
Merge branch 'master' into sr-only-focusable
Conflicts:
dist/css/bootstrap.css
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/bower.json b/bower.json index 3bb72d100..d0f895465 100644 --- a/bower.json +++ b/bower.json @@ -1,13 +1,23 @@ { "name": "bootstrap", - "version": "3.1.0", + "version": "3.1.1", + "keywords": [ + "css", + "js", + "less", + "mobile-first", + "responsive", + "front-end", + "framework", + "web" + ], "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" + "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": [ "**/.*", |