]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Jan 2012 20:11:26 +0000 (12:11 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Jan 2012 20:11:26 +0000 (12:11 -0800)
1  2 
docs/javascript.html

Simple merge