]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of https://github.com/twitter/bootstrap
authorJacob Thornton <jacobthornton@gmail.com>
Fri, 4 Nov 2011 20:35:31 +0000 (13:35 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Fri, 4 Nov 2011 20:35:31 +0000 (13:35 -0700)
1  2 
docs/index.html

diff --cc docs/index.html
Simple merge