]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61aa9a4 bb50e33)
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Mon, 7 Oct 2013 00:06:40 +0000 (19:06 -0500)
committerMark Otto <otto@github.com>
Mon, 7 Oct 2013 00:06:40 +0000 (19:06 -0500)
Conflicts:
css.html


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