]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f5c754 70278a4)
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Mon, 14 Oct 2013 18:06:25 +0000 (11:06 -0700)
committerMark Otto <otto@github.com>
Mon, 14 Oct 2013 18:06:25 +0000 (11:06 -0700)
Conflicts:
getting-started.html

1  2 
getting-started.html patch | diff1 | diff2 | blob | history

diff --cc getting-started.html
Simple merge
Mirror of https://github.com/twbs/bootstrap.git