]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 145ed23 5cf2e8a)
Merge branch '2.2.2-wip' into 3.0.0-wip
authorMark Otto <otto@github.com>
Wed, 5 Dec 2012 19:05:10 +0000 (11:05 -0800)
committerMark Otto <otto@github.com>
Wed, 5 Dec 2012 19:05:10 +0000 (11:05 -0800)
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less


Trivial merge
Mirror of https://github.com/twbs/bootstrap.git