]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f2d289 8245760)
Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask...
authorMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 23:01:25 +0000 (15:01 -0800)
committerMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 23:01:25 +0000 (15:01 -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
less/mixins.less patch | diff1 | diff2 | blob | history

diff --cc docs/assets/bootstrap.zip
index 549d70fe2097484ee14230c6116990541e3af2f9,d1b9b51e0b120394c82d5741fdccef4c996a9fb5..cdbb2c88e7552e1247427f8f2d4385aa791b82cc
Binary files differ
diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc less/mixins.less
Simple merge
Mirror of https://github.com/twbs/bootstrap.git