]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b79a2b3 147837e)
Merge branch 'master' into gh-pages
authorMark Otto <otto@github.com>
Wed, 30 Oct 2013 16:00:29 +0000 (09:00 -0700)
committerMark Otto <otto@github.com>
Wed, 30 Oct 2013 16:00:29 +0000 (09:00 -0700)
Conflicts:
_layouts/home.html
assets/css/docs.css


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