]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 330b143 3096a37)
Merge branch 'sparanoid-transition-duration' into 2.3.0-wip
authorMark Otto <otto@github.com>
Fri, 28 Dec 2012 19:08:49 +0000 (13:08 -0600)
committerMark Otto <otto@github.com>
Fri, 28 Dec 2012 19:08:49 +0000 (13:08 -0600)
Conflicts:
docs/assets/img/bootstrap-docs-readme.png


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