diff options
| author | Jacob Thornton <[email protected]> | 2011-11-30 22:05:49 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-11-30 22:05:49 -0800 |
| commit | b1cba98aab5ee2d0576bbbbb92ba3488516290eb (patch) | |
| tree | cb938e0ba8f666ffbd8e6436b8e3b4fb1490adc4 /README.md | |
| parent | dc628c9115b74e49940c0cc200a8914232c9d2a2 (diff) | |
| parent | bc51c15709469fd0c2e78886a15e849626a8f191 (diff) | |
| download | bootstrap-b1cba98aab5ee2d0576bbbbb92ba3488516290eb.tar.xz bootstrap-b1cba98aab5ee2d0576bbbbb92ba3488516290eb.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -18,7 +18,7 @@ Here's what the LESS version looks like: <script src="less.js" type="text/javascript"></script> ``` -Or if you prefer, the standard css way: +Or if you prefer, the standard CSS way: ``` html <link rel="stylesheet" type="text/css" href="bootstrap.css"> @@ -72,7 +72,7 @@ http://groups.google.com/group/twitter-bootstrap Developers ---------- -We have included a makefile with convenience methods for working with the bootstrap library. +We have included a makefile with convenience methods for working with the Bootstrap library. + **build** - `make build` This will run the less compiler on the bootstrap lib and generate a bootstrap.css and bootstrap.min.css file. |