Mark Otto 80eb09cc1b Merge branch '3.0.0-wip' into bs3_navbar_overhaul ... Conflicts: components.html dist/css/bootstrap.min.css		2013-08-12 21:34:55 -07:00
..
ads.html	…
footer.html	rebuild + first bit of customizer urls	2013-08-11 18:42:13 -07:00
header.html	…
nav-components.html	Navbar refactor	2013-08-12 21:23:28 -07:00
nav-css.html	fixes #9317: document media queries	2013-08-12 00:48:36 -07:00
nav-customize.html	…
nav-getting-started.html	…
nav-javascript.html	…
nav-main.html	Navbar refactor	2013-08-12 21:23:28 -07:00
old-bs-docs.html	…
social-buttons.html	drop iframe attributes for CSS styling	2013-08-12 17:46:02 -07:00