]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <mark.otto@twitter.com>
Sat, 22 Oct 2011 22:51:24 +0000 (15:51 -0700)
committerMark Otto <mark.otto@twitter.com>
Sat, 22 Oct 2011 22:51:24 +0000 (15:51 -0700)
commitfb7fbdb278cc76c597acb69de5cd3a5d6eb77b00
tree1a5eaa04a4938a0c26ee092c7bc457f578bf5ebb
parentd4675bf4ef8019fc80e3b6816d3597c07cde81df
parent2e09ffe3832106fab60dc01cc3159c13029bdf68
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
lib/responsive.less
bootstrap.css