]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7875e48 452d8c1)
Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2...
authorMark Otto <markotto@twitter.com>
Mon, 4 Jun 2012 15:47:41 +0000 (08:47 -0700)
committerMark Otto <markotto@twitter.com>
Mon, 4 Jun 2012 15:47:41 +0000 (08:47 -0700)
1  2 
docs/assets/css/bootstrap.css patch | diff1 | diff2 | blob | history
less/mixins.less patch | diff1 | diff2 | blob | history

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