]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sat, 3 Sep 2011 06:16:06 +0000 (23:16 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Sat, 3 Sep 2011 06:16:06 +0000 (23:16 -0700)
1  2 
docs/index.html

diff --cc docs/index.html
Simple merge