]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.2-wip' into box-sizing-exercise
authorMark Otto <markotto@twitter.com>
Wed, 26 Sep 2012 05:00:41 +0000 (22:00 -0700)
committerMark Otto <markotto@twitter.com>
Wed, 26 Sep 2012 05:00:41 +0000 (22:00 -0700)
commitce19e63d5b068ba0698dee4e2d99c725f6799b0d
treebda8377cdc83204780bdf624833725a127ded586
parent527d01ce99a0cae8eae7868c0649dca60cda338c
parentf4d3d7da2e3ddbd751e053729935df1f3dd4c051
Merge branch '2.1.2-wip' into box-sizing-exercise

Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache
less/forms.less
less/mixins.less
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/base-css.html
docs/scaffolding.html
docs/templates/pages/base-css.mustache
less/forms.less
less/mixins.less
less/variables.less