Mark Otto 33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip ...

Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less

2012-12-05 11:05:10 -08:00

..

carousel.html

Once more, update all the favicons to retina

2012-12-03 13:25:56 -08:00

hero.html

Once more, update all the favicons to retina

2012-12-03 13:25:56 -08:00

marketing-alternate.html

Once more, update all the favicons to retina

2012-12-03 13:25:56 -08:00

marketing-narrow.html

Once more, update all the favicons to retina

2012-12-03 13:25:56 -08:00

signin.html

Once more, update all the favicons to retina

2012-12-03 13:25:56 -08:00

starter-template.html

Once more, update all the favicons to retina

2012-12-03 13:25:56 -08:00

sticky-footer.html

Once more, update all the favicons to retina

2012-12-03 13:25:56 -08:00