Skip to content

B
bootstrap
Commit 235811cd authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'alexpeattie-master' into 2.0.2-wip

parents a95c15a5 0112b56c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
docs/scaffolding.html
View file @ 235811cd
...@@ -504,7 +504,7 @@ ...@@ -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>
......
docs/templates/pages/scaffolding.mustache
View file @ 235811cd
...@@ -428,7 +428,7 @@ ...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment