Mark Otto 9dcae610e9 Merge branch '3.0.0-wip' into bs3_homepage ...

Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css

2013-08-18 19:02:42 -07:00

..

index.html

add IE's Conditional comments for respondjs and html5shiv

2013-08-18 14:28:52 +08:00

jumbotron-narrow.css

it's levi-OH-sa, not levi-oh-SAR

2013-08-17 22:51:00 -07:00