]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Fri, 17 May 2013 03:32:37 +0000 (20:32 -0700)
committerMark Otto <otto@github.com>
Fri, 17 May 2013 03:32:37 +0000 (20:32 -0700)
1  2 
docs/javascript.html

Simple merge