]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0...
authorMark Otto <otto@github.com>
Mon, 5 Aug 2013 23:03:10 +0000 (16:03 -0700)
committerMark Otto <otto@github.com>
Mon, 5 Aug 2013 23:03:10 +0000 (16:03 -0700)
commit04dc22103706519dfc48c6634351a66a3218221f
treedb41dd228717589b7a67727913e1c5ddfe74bd83
parent9bbe8a020a9082cbec011c8fae66bc5ffc8fe5bd
parent1aedb7862ccf93bb983652bc24c11cc9f01699d3
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip

Conflicts:
customize.html
less/alerts.less
less/badges.less
less/button-groups.less
less/buttons.less
less/carousel.less
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/alerts.less
less/badges.less
less/button-groups.less
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/variables.less