]> 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>
Mon, 30 Jan 2012 08:43:57 +0000 (00:43 -0800)
committerMark Otto <markdotto@gmail.com>
Mon, 30 Jan 2012 08:43:57 +0000 (00:43 -0800)
commit0f088af855908dc2e093772cfcf54c30893b952a
treea13151ebb642eb5455aed2c4631fc97184218233
parentae7f94eeff733584cbdc80a2d13a85f136a7744e
parent734bfe7f78574477a264f5ed430dc266d29f38f4
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/bootstrap.zip
less/responsive.less
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
less/responsive.less