]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.2.2-wip' into exploratory
authorMark Otto <otto@github.com>
Sat, 3 Nov 2012 20:44:01 +0000 (13:44 -0700)
committerMark Otto <otto@github.com>
Sat, 3 Nov 2012 20:44:01 +0000 (13:44 -0700)
commita249d1c8ee597c4f0f29da55b15cf35accd4221c
treeefc755be687dab37f3298c76d4be1649bfe5dec6
parent1477e081d46ebf6a5e6acb06debb7edb1a324918
parent5d6cf2ee1939515ad41b052ed1c406f96274ea37
Merge branch '2.2.2-wip' into exploratory

Conflicts:
docs/assets/css/bootstrap.css
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache
14 files changed:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/base-css.html
docs/components.html
docs/customize.html
docs/javascript.html
docs/scaffolding.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
docs/templates/pages/scaffolding.mustache
less/labels-badges.less
less/popovers.less
less/reset.less