]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_remove_examples
authorMark Otto <otto@github.com>
Thu, 18 Jul 2013 03:44:27 +0000 (20:44 -0700)
committerMark Otto <otto@github.com>
Thu, 18 Jul 2013 03:44:27 +0000 (20:44 -0700)
commitf0d071832284d968f2cb72b0bb576f8112a349de
tree9766c8da2b7c6890cdc794a2d93d4ca81c191047
parentc5fb401a626c3e0d99a764cb7961e1bd3e619e8f
parentbfebf0e490c795601220f74b7089adb4f47acda7
Merge branch '3.0.0-wip' into bs3_remove_examples

Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
docs/_includes/nav-getting-started.html
docs/getting-started.html
docs/index.html