Merge branch '2.2.2-wip' into exploratory
Conflicts: docs/assets/css/bootstrap.css docs/components.html docs/templates/pages/components.mustache less/alerts.less less/button-groups.less less/buttons.less less/tests/css-tests.html
Showing
composer.json
0 → 100644
| { | |||
| "name": "twitter/bootstrap" | |||
| , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." | |||
| , "keywords": ["bootstrap", "css"] | |||
| , "homepage": "http://twitter.github.com/bootstrap/" | |||
| , "author": "Twitter Inc." | |||
| , "license": "Apache-2.0" | |||
| , "target-dir": "twitter/bootstrap" | |||
| } |
Please register or sign in to comment