Mark Otto cabb86d126 Merge branch 'master' into derp ...

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/_includes/components/progress-bars.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map

2014-07-11 00:38:28 -07:00

..

affix.html

clarify and danger-ify affix docs usage requirements, per #10235

2014-05-22 20:14:32 -07:00

alerts.html

.btn-default to .btn-secondary

2014-07-08 17:14:14 -07:00

buttons.html

tweak alert per #13875

2014-06-19 19:54:25 -07:00

carousel.html

Merge pull request #14072 from twbs/carousel-gloss-buttons

2014-07-07 20:16:52 -07:00

collapse.html

Merge pull request #14089 from twbs/accordion-panel-group-aria-multiselectable

2014-07-08 12:56:06 -07:00

dropdowns.html

Merge branch 'master' into derp

2014-07-11 00:38:28 -07:00

modal.html

remove deprecated warnings from docs

2014-07-09 13:51:20 -07:00

overview.html

quote attribute value in selector in JS docs example

2014-04-19 17:42:06 -07:00

popovers.html

.btn-default to .btn-secondary

2014-07-08 17:14:14 -07:00

scrollspy.html

Refactor: drop .dropdown .caret for a generated caret using .dropdown-toggle:after

2014-07-08 14:23:34 -07:00

tabs.html

Merge branch 'master' into derp

2014-07-09 22:19:23 -07:00

tooltips.html

.btn-default to .btn-secondary

2014-07-08 17:14:14 -07:00

transitions.html

Break up docs into includes

2014-03-16 19:03:53 -07:00