Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts: docs/assets/css/bootstrap.css
This commit is contained in:
commit
335a8686da
12 changed files with 23 additions and 23 deletions
|
|
@ -54,7 +54,7 @@
|
|||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue