1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 12:59:05 +02:00

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

Conflicts:
	bootstrap.css
	bootstrap.min.css
	docs/javascript.html
	lib/accordion.less
This commit is contained in:
Mark Otto
2012-01-17 23:19:21 -08:00
5 changed files with 60 additions and 55 deletions

View File

@@ -623,7 +623,7 @@
<h3>1. Default table styles</h3>
<div class="row">
<div class="span4">
<p>Tables are automatically styled with only the a few borders to ensure readability and maintain structure. No classes are required.</p>
<p>Tables are automatically styled with only a few borders to ensure readability and maintain structure. No classes are required.</p>
<pre class="prettyprint linenums">
&lt;table&gt;
...