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
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 52 additions and 36 deletions
+52 -36
--- a/examples/theme/theme.css
+++ b/examples/theme/theme.css
--- a/getting-started.html
+++ b/getting-started.html
--- a/index.html
+++ b/index.html
--- a/javascript.html
+++ b/javascript.html
--- a/js/carousel.js
+++ b/js/carousel.js
--- a/js/dropdown.js
+++ b/js/dropdown.js
--- a/js/modal.js
+++ b/js/modal.js
--- a/js/popover.js
+++ b/js/popover.js
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
--- a/.csscomb.json
+++ b/.csscomb.json
--- a/.csslintrc
+++ b/.csslintrc
--- a/package.json
+++ b/package.json
--- a/sauce_browsers.yml
+++ b/sauce_browsers.yml