]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.3.0-wip' into 3.0.0-wip
authorMark Otto <otto@github.com>
Fri, 1 Feb 2013 18:34:25 +0000 (10:34 -0800)
committerMark Otto <otto@github.com>
Fri, 1 Feb 2013 18:34:25 +0000 (10:34 -0800)
commit2553d74b5459a3093e3dd42eecd9766005c024be
tree30f3660cc35e5920ff5a16792439debb909d6d5d
parent725cf7f6ec37668fab0ec8f59ae748feff5335f1
parent7d655c35494012f15bc1f9ae515e92ca4c432a66
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
docs/examples/hero.html
docs/examples/sticky-footer-navbar.html
docs/examples/sticky-footer-navbar.html