diff options
| author | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
| commit | fca35c0dba060da14ccb29fc56dc37aa1de533c4 (patch) | |
| tree | 04cc972e705bedb2910247bdcfb0c8ede3cee09a /composer.json | |
| parent | 7e56e2265d67ae81ad8be52af4d56f189929207a (diff) | |
| parent | bca3ff4ed6f42701ceae1405f518c35ec8c623be (diff) | |
| download | bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.tar.xz bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.zip | |
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
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/composer.json b/composer.json new file mode 100644 index 000000000..5ddf13636 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "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" + +} |