]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12d3c2f 39f70af)
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sat, 28 Jan 2012 20:09:16 +0000 (12:09 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Sat, 28 Jan 2012 20:09:16 +0000 (12:09 -0800)
1  2 
docs/assets/css/bootstrap.css patch | diff1 | diff2 | blob | history
less/modals.less patch | diff1 | diff2 | blob | history

diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc less/modals.less
Simple merge
Mirror of https://github.com/twbs/bootstrap.git