aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/colophon.html
diff options
context:
space:
mode:
authorIvan Khalopik <[email protected]>2013-05-07 15:16:45 +0300
committerIvan Khalopik <[email protected]>2013-05-07 15:16:45 +0300
commit3c7a43a1f373d0c534476578b96a75ae2e63c985 (patch)
treef11fa18c33d1a65ae4422dc3c352c34a2b323b8c /docs/_includes/colophon.html
parent41c782567775d3bbcfc62d163ae22a531277b5e2 (diff)
parentb352f98f325adbd994f01cb94f4d0a454783bbce (diff)
downloadbootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.tar.xz
bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.zip
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts: js/tests/unit/bootstrap-collapse.js
Diffstat (limited to 'docs/_includes/colophon.html')
-rw-r--r--docs/_includes/colophon.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html
index 5c15d7c78..5018113b4 100644
--- a/docs/_includes/colophon.html
+++ b/docs/_includes/colophon.html
@@ -1,7 +1,7 @@
<!-- Footer
================================================== -->
<footer class="bs-docs-footer">
- <div class="container">
+ <div class="bs-docs-container">
<div class="bs-docs-social">
<ul class="bs-docs-social-buttons">
@@ -32,4 +32,4 @@
<li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
</ul>
</div>
-</footer> \ No newline at end of file
+</footer>