diff options
| author | Mark Otto <[email protected]> | 2014-03-06 21:32:52 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-06 21:32:52 -0800 |
| commit | c8614c0f15f0ce78426c6403e57aff22c3ce2beb (patch) | |
| tree | 673d1a347374a8bf53a127c050dbc57762af3782 /bower.json | |
| parent | d1a7271ea1272e0f9775d49e6a84ee49819e0094 (diff) | |
| parent | fab10b643eb1a2038fb31305f0b038b7a9a8554d (diff) | |
| download | bootstrap-c8614c0f15f0ce78426c6403e57aff22c3ce2beb.tar.xz bootstrap-c8614c0f15f0ce78426c6403e57aff22c3ce2beb.zip | |
Merge branch 'master' into pr/12490
Conflicts:
less/list-group.less
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/bower.json b/bower.json index 3bb72d100..05ff702ab 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,16 @@ { "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", |