]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Fri, 9 Dec 2011 19:33:02 +0000 (11:33 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 9 Dec 2011 19:33:02 +0000 (11:33 -0800)
commit312ee6cdfb20f7602924c90e6ae37cba62a39da4
tree1931bb96def7cc20931b6f763fcd934abaeddeb8
parentb12b71bf7ca76437a532122d8efff59506b61530
parentcee2f61898f4807311402fed747a93ee68a31f8f
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
bootstrap.css