]> 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)
commite4aa1fcef4e4a7b9830ff13a204170478695c1bb
treecbaad65bc59f6413b42410650b4d084d6d53c0fd
parentce497ae73088ecec492a5de2a2ae5a460ba27fbc
parentcc58a65fa125f119af713db5d92413c093503ce4
Merge branch '2.3.0-wip' into 3.0.0-wip

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