Merge branch 'master' into docs_derp

Conflicts: _config.yml docs/_includes/footer.html docs/_includes/nav-main.html docs/_includes/old-bs-docs.html docs/_layouts/default.html docs/_layouts/home.html docs/getting-started.html docs/index.html

Merge branch 'master' into docs_derp
Conflicts: _config.yml docs/_includes/footer.html docs/_includes/nav-main.html docs/_includes/old-bs-docs.html docs/_layouts/default.html docs/_layouts/home.html docs/getting-started.html docs/index.html
b253cb2c · Mark Otto · 9e1153d0 · 8812856d · b253cb2c · b253cb2c
Commit b253cb2c authored 11 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 0 deletions
+0 -0
--- a/examples/screenshots/justified-nav.jpg
+++ b/examples/screenshots/justified-nav.jpg
--- a/examples/screenshots/navbar-fixed.jpg
+++ b/examples/screenshots/navbar-fixed.jpg
--- a/examples/screenshots/navbar-static.jpg
+++ b/examples/screenshots/navbar-static.jpg
--- a/examples/screenshots/navbar.jpg
+++ b/examples/screenshots/navbar.jpg
--- a/examples/screenshots/non-responsive.jpg
+++ b/examples/screenshots/non-responsive.jpg
--- a/examples/screenshots/offcanvas.jpg
+++ b/examples/screenshots/offcanvas.jpg
--- a/examples/screenshots/sign-in.jpg
+++ b/examples/screenshots/sign-in.jpg
--- a/examples/screenshots/starter-template.jpg
+++ b/examples/screenshots/starter-template.jpg
--- a/examples/screenshots/sticky-footer-navbar.jpg
+++ b/examples/screenshots/sticky-footer-navbar.jpg
--- a/examples/screenshots/sticky-footer.jpg
+++ b/examples/screenshots/sticky-footer.jpg
--- a/examples/screenshots/theme.jpg
+++ b/examples/screenshots/theme.jpg
--- a/examples/signin/index.html
+++ b/examples/signin/index.html
--- a/examples/signin/signin.css
+++ b/examples/signin/signin.css
--- a/examples/starter-template/index.html
+++ b/examples/starter-template/index.html
--- a/examples/starter-template/starter-template.css
+++ b/examples/starter-template/starter-template.css
--- a/examples/sticky-footer-navbar/index.html
+++ b/examples/sticky-footer-navbar/index.html
--- a/examples/sticky-footer-navbar/sticky-footer-navbar.css
+++ b/examples/sticky-footer-navbar/sticky-footer-navbar.css
--- a/examples/sticky-footer/index.html
+++ b/examples/sticky-footer/index.html
--- a/examples/sticky-footer/sticky-footer.css
+++ b/examples/sticky-footer/sticky-footer.css
--- a/examples/theme/index.html
+++ b/examples/theme/index.html