]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89ccbdf 51ec513)
Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask...
authorMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 23:04:52 +0000 (15:04 -0800)
committerMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 23:04:52 +0000 (15:04 -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 cdbb2c88e7552e1247427f8f2d4385aa791b82cc,069727cf0ff0b9d561ae58253175d93fc6107cb8..811291999d287ed9cc68a2dee60b917352901810
Binary files differ
diff --cc docs/assets/css/bootstrap.css
Simple merge
Mirror of https://github.com/twbs/bootstrap.git