]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins...
authorMark Otto <markdotto@gmail.com>
Sat, 28 Jan 2012 00:35:32 +0000 (16:35 -0800)
committerMark Otto <markdotto@gmail.com>
Sat, 28 Jan 2012 00:35:32 +0000 (16:35 -0800)
commitd9759abeebbca0681054f8da3ff7c3029948284e
treec78f1198898b07fdc8911a3d3310dd2e5f5ed355
parentf6dc566963c63d5113e72f0098ad9da2c414f33f
parent84b9a1bfb6ff5d1406f5c0393d6556caff6de40c
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components

Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache
less/buttons.less
less/navbar.less
less/sprites.less