Mark Otto 72d1761256 Merge branch 'master' into v4 ...

Conflicts:
	docs/_includes/js/collapse.html

2014-12-01 01:41:10 -08:00

..

affix.md

…

alerts.md

…

buttons.md

…

carousel.md

…

collapse.md

…

dropdowns.md

…

modal.md

…

overview.md

…

popovers.md

…

scrollspy.md

…

tabs.md

…

tooltips.md

…

transitions.md

…