]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <mark.otto@twitter.com>
Sat, 12 Nov 2011 09:23:37 +0000 (01:23 -0800)
committerMark Otto <mark.otto@twitter.com>
Sat, 12 Nov 2011 09:23:37 +0000 (01:23 -0800)
1  2 
docs/index.html
docs/less.html

diff --cc docs/index.html
Simple merge
diff --cc docs/less.html
Simple merge