diff options
| author | Mark Otto <[email protected]> | 2012-11-03 13:44:01 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-03 13:44:01 -0700 |
| commit | a249d1c8ee597c4f0f29da55b15cf35accd4221c (patch) | |
| tree | efc755be687dab37f3298c76d4be1649bfe5dec6 /docs/scaffolding.html | |
| parent | 1477e081d46ebf6a5e6acb06debb7edb1a324918 (diff) | |
| parent | 5d6cf2ee1939515ad41b052ed1c406f96274ea37 (diff) | |
| download | bootstrap-a249d1c8ee597c4f0f29da55b15cf35accd4221c.tar.xz bootstrap-a249d1c8ee597c4f0f29da55b15cf35accd4221c.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index d8273e910..596379c87 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -228,7 +228,6 @@ - <!-- Layouts (Default and fluid) ================================================== --> <section id="layouts"> |