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

Conflicts:
	docs/_includes/js/collapse.html

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

..

affix.md

Merge branch 'master' into derp

2014-08-02 18:30:59 -07:00

alerts.md

Merge branch 'master' into v4

2014-11-30 20:17:45 -08:00

buttons.md

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

carousel.md

Merge branch 'master' into v4

2014-11-30 20:17:45 -08:00

collapse.md

Merge branch 'master' into v4

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

dropdowns.md

Merge branch 'master' into v4

2014-11-30 20:17:45 -08:00

modal.md

Merge branch 'master' into v4

2014-11-30 20:17:45 -08:00

overview.md

Merge branch 'master' into v4

2014-11-30 20:17:45 -08:00

popovers.md

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

scrollspy.md

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

tabs.md

fixes and grunt

2014-11-30 21:01:50 -08:00

tooltips.md

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

transitions.md

…