]> 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>
Thu, 20 Oct 2011 16:14:02 +0000 (09:14 -0700)
committerMark Otto <mark.otto@twitter.com>
Thu, 20 Oct 2011 16:14:02 +0000 (09:14 -0700)
1  2 
docs/index.html

diff --cc docs/index.html
Simple merge