]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7dcfc44 c0f477a)
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Mon, 19 Aug 2013 06:52:22 +0000 (23:52 -0700)
committerMark Otto <otto@github.com>
Mon, 19 Aug 2013 06:52:22 +0000 (23:52 -0700)
Conflicts:
getting-started.html

1  2 
assets/js/customizer.js patch | diff1 | diff2 | blob | history
getting-started.html patch | diff1 | diff2 | blob | history

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