]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of http://git.local.twitter.com/bootstrap
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 30 Jun 2011 20:57:41 +0000 (13:57 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 30 Jun 2011 20:57:41 +0000 (13:57 -0700)
1  2 
docs/index.html

diff --cc docs/index.html
Simple merge