0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

Merge branch 'alexpeattie-master' into 2.0.2-wip

This commit is contained in:
Mark Otto 2012-03-05 00:34:54 -08:00
commit 235811cd8a
2 changed files with 2 additions and 2 deletions

View File

@ -504,7 +504,7 @@
</tr> </tr>
<tr> <tr>
<td>Large display</td> <td>Large display</td>
<td>1210px and up</td> <td>1200px and up</td>
<td>70px</td> <td>70px</td>
<td>30px</td> <td>30px</td>
</tr> </tr>

View File

@ -428,7 +428,7 @@
</tr> </tr>
<tr> <tr>
<td>{{_i}}Large display{{/i}}</td> <td>{{_i}}Large display{{/i}}</td>
<td>1210px and up</td> <td>1200px and up</td>
<td>70px</td> <td>70px</td>
<td>30px</td> <td>30px</td>
</tr> </tr>