]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edd0b97 8fb75ee)
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Tue, 14 Jan 2014 23:53:06 +0000 (15:53 -0800)
committerMark Otto <otto@github.com>
Tue, 14 Jan 2014 23:53:06 +0000 (15:53 -0800)
Conflicts:
docs/_includes/old-bs-docs.html


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