]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhl...
authorMark Otto <otto@github.com>
Wed, 6 Feb 2013 03:39:49 +0000 (19:39 -0800)
committerMark Otto <otto@github.com>
Wed, 6 Feb 2013 03:39:49 +0000 (19:39 -0800)
commit0a8d834af61725a61ca7fbc917dd4ae1d36f0769
treeac34c3545a6d1ef2af5897e5d6c5df093293224a
parentcc58a65fa125f119af713db5d92413c093503ce4
parent034155ec215f3c6dadbc22939737de5184128756
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip

Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
fluid.html
hero.html