diff options
| author | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
| commit | 0143e38a672335b7ca2d73d0de5b2a2b4618f9e9 (patch) | |
| tree | 7188809b7c2194fc0aca9a65b7d07725ee4206d5 /composer.json | |
| parent | 642fd5100293755a6003448d4a481f3b314edf15 (diff) | |
| parent | 1f148427de6d35a06e225deeee0b162b11955232 (diff) | |
| download | bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.tar.xz bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.zip | |
Merge branch 'master' into document_popover_focus
Conflicts:
docs/assets/js/docs.min.js
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": [ { |