]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3470c0d f281408)
Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr
authorMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 23:38:34 +0000 (15:38 -0800)
committerMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 23:38:34 +0000 (15:38 -0800)
Conflicts:
docs/assets/bootstrap.zip

1  2 
docs/assets/bootstrap.zip patch | diff1 | diff2 | blob | history
docs/assets/css/bootstrap.css patch | diff1 | diff2 | blob | history

diff --cc docs/assets/bootstrap.zip
index 811291999d287ed9cc68a2dee60b917352901810,307e72ac928c25fa1d092652938adedfbff5cf42..6dedf14358011bc6c197954ef49b9f50ce3a3ce9
Binary files differ
diff --cc docs/assets/css/bootstrap.css
Simple merge
Mirror of https://github.com/twbs/bootstrap.git