Skip to content

Commit

Permalink
Merge pull request twbs#3157 from caniszczyk/2.0.3-wip
Browse files Browse the repository at this point in the history
Add TravisCI support and update README
  • Loading branch information
fat committed Apr 19, 2012
2 parents fd00959 + c99dcd2 commit de9271b
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -32,4 +32,5 @@ nbproject
.hg
.svn
.CVS
.idea
.idea
node_modules
4 changes: 4 additions & 0 deletions .travis.yml
@@ -0,0 +1,4 @@
language: node_js
node_js:
- 0.6
script: "make build"
2 changes: 1 addition & 1 deletion README.md
@@ -1,4 +1,4 @@
[Twitter Bootstrap](http://twitter.github.com/bootstrap)
[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
=================

Bootstrap provides simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. In other words, it's a front-end toolkit for faster, more beautiful web development. It's created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
Expand Down
22 changes: 22 additions & 0 deletions package.json
@@ -0,0 +1,22 @@
{
"name": "bootstrap"
, "description": "HTML, CSS, and JS toolkit from Twitter."
, "version": "2.0.3"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twitter.github.com/bootstrap/"
, "author": "Twitter Inc."
, "repository": {
"type": "git"
, "url": "https://github.com/twitter/bootstrap.git"
}
, "licenses": [
{ "type": "Apache-2.0"
, "url": "http://www.apache.org/licenses/LICENSE-2.0"
}
]
, "devDependencies": {
"uglify-js": "*"
, "jshint": "*"
, "recess": "*"
}
}

0 comments on commit de9271b

Please sign in to comment.