mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
Merge branch 'alexpeattie-master' into 2.0.2-wip
This commit is contained in:
commit
235811cd8a
@ -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
2
docs/templates/pages/scaffolding.mustache
vendored
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user