Merge branch 'alexpeattie-master' into 2.0.2-wip

235811cd · Mark Otto · a95c15a5 · 0112b56c · 235811cd · 235811cd
Commit 235811cd authored 13 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -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>

--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -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>