diff options
| author | Mark Otto <[email protected]> | 2012-03-05 00:34:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-05 00:34:54 -0800 |
| commit | 235811cd8a4302e94e0b65c5561ba98629445a04 (patch) | |
| tree | b5988be4b7d7906a491c531c8ad2efd7b4cc6520 | |
| parent | a95c15a5307bd5c0028eaad51a4ceddc5498e436 (diff) | |
| parent | 0112b56c9cb8e253acddc77290f3a432f881b594 (diff) | |
| download | bootstrap-235811cd8a4302e94e0b65c5561ba98629445a04.tar.xz bootstrap-235811cd8a4302e94e0b65c5561ba98629445a04.zip | |
Merge branch 'alexpeattie-master' into 2.0.2-wip
| -rw-r--r-- | docs/scaffolding.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index ea95796d5..07932f549 100644 --- 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> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index d9a2f50d1..97131fdf2 100644 --- 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> |