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 /composer.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 'composer.json')
| -rw-r--r-- | composer.json | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/composer.json b/composer.json index 93ed9f2df..92056297a 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,16 @@ { "name": "twbs/bootstrap", - "description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.", - "keywords": ["bootstrap", "css"], + "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", + "keywords": [ + "css", + "js", + "less", + "mobile-first", + "responsive", + "front-end", + "framework", + "web" + ], "homepage": "http://getbootstrap.com", "authors": [ { |