diff options
| author | Jacob Thornton <[email protected]> | 2012-01-11 21:43:43 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-11 21:43:43 -0800 |
| commit | 19090ea33322e9d4309497f838f8627ca21734bf (patch) | |
| tree | 7f1010c2f6af8ecf3c13c149925e08ce688aeac5 /docs | |
| parent | 6f2f947a4309a8fdeb7067612447c0f1a15dcfd9 (diff) | |
| parent | a2ebf0c0c1381c38dda24bf12aebd5f9b4907e06 (diff) | |
| download | bootstrap-19090ea33322e9d4309497f838f8627ca21734bf.tar.xz bootstrap-19090ea33322e9d4309497f838f8627ca21734bf.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/scaffolding.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 3a0cce80a..b868fd215 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -196,7 +196,7 @@ <div class="row"> <div class="span4"> <h3>Variables in LESS</h3> - <p>Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in mixins.less.</p> + <p>Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.</p> </div> <div class="span4"> <h3>How to customize</h3> |