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 /composer.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 '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": [ { |