Mark Otto 2cc66cbb58 Merge branch 'master' into derp ...

Conflicts:
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/_variables.less

2014-11-09 23:48:56 -08:00

..

getting-started

Merge branch 'master' into derp

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

js

Merge branch 'master' into derp

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

nav

Merge pull request #14986 from twbs/safari-broken-printing-doc

2014-11-05 14:59:24 -08:00

ads.html

Rearrange repository contents because muahahahahahaha

2013-12-28 22:47:03 -08:00

customize-nav.html

Merge branch 'master' into derp

2014-08-04 15:09:23 -07:00

customizer-variables.html

Merge branch 'master' into derp

2014-11-09 23:48:56 -08:00

docs-nav.html

fix sidebar again

2014-08-03 16:23:32 -07:00

footer.html

Merge branch 'master' into derp

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

header.html

Merge branch 'master' into derp

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

home-nav.html

fix home nav

2014-10-27 01:34:43 -07:00

social-buttons.html

Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs-

2014-02-08 23:24:38 -08:00