root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'alexpeattie-master' into 2.0.2-wip

This commit is contained in:
Mark Otto 2012-03-05 00:34:54 -08:00
parent a95c15a530 0112b56c9c
commit 235811cd8a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/scaffolding.html
View File

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

2
docs/templates/pages/scaffolding.mustache vendored
View File

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