]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac3f48b 295736a)
Merge branch 'master' into docs_dir 12037/head
authorMark Otto <otto@github.com>
Tue, 31 Dec 2013 21:43:11 +0000 (13:43 -0800)
committerMark Otto <otto@github.com>
Tue, 31 Dec 2013 21:43:11 +0000 (13:43 -0800)

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