2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
This commit is contained in:
Mark Otto
2013-02-04 11:12:09 -08:00
8 changed files with 360 additions and 11 deletions
+1 -2
View File
@@ -794,8 +794,7 @@
<code>&lt;th&gt;</code>
</td>
<td>
{{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}<br>
{{_i}}Must be used within a <code>&lt;thead&gt;</code>{{/i}}
{{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}
</td>
</tr>
<tr>