]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc3de8b a40ab1c)
Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck...
authorMark Otto <markotto@twitter.com>
Tue, 18 Sep 2012 21:58:39 +0000 (14:58 -0700)
committerMark Otto <markotto@twitter.com>
Tue, 18 Sep 2012 21:58:39 +0000 (14:58 -0700)
1  2 
docs/assets/css/bootstrap.css patch | diff1 | diff2 | blob | history
docs/components.html patch | diff1 | diff2 | blob | history
docs/templates/pages/components.mustache patch | diff1 | diff2 | blob | history

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