]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.2.2-wip' into exploratory
authorMark Otto <otto@github.com>
Fri, 30 Nov 2012 08:13:30 +0000 (00:13 -0800)
committerMark Otto <otto@github.com>
Fri, 30 Nov 2012 08:13:30 +0000 (00:13 -0800)
commitfca35c0dba060da14ccb29fc56dc37aa1de533c4
tree04cc972e705bedb2910247bdcfb0c8ede3cee09a
parent7e56e2265d67ae81ad8be52af4d56f189929207a
parentbca3ff4ed6f42701ceae1405f518c35ec8c623be
Merge branch '2.2.2-wip' into exploratory

Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
24 files changed:
Makefile
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/base-css.html
docs/components.html
docs/customize.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/carousel.less
less/dropdowns.less
less/forms.less
less/mixins.less
less/navbar.less
less/navs.less
less/popovers.less
less/tests/css-tests.html