rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
This commit is contained in:
Mark Otto 2011-11-29 22:35:58 -08:00
commit cbb291b8ab
32 changed files with 1372 additions and 658 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/base-css.html
View file

@ -37,7 +37,7 @@
<li><a href="./scaffolding.html">Scaffolding</a></li>
<li class="active"><a href="./base-css.html">Base CSS</a></li>
<li><a href="./components.html">Components</a></li>
<li><a href="./javascript.html">Javascript</a></li>
<li><a href="./javascript.html">Javascript plugins</a></li>
<li><a href="./less.html">Using LESS</a></li>
</ul>
</div>