]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
authorMark Otto <markotto@twitter.com>
Sun, 19 Aug 2012 18:54:05 +0000 (11:54 -0700)
committerMark Otto <markotto@twitter.com>
Sun, 19 Aug 2012 18:54:05 +0000 (11:54 -0700)
1  2 
docs/javascript.html
docs/templates/pages/javascript.mustache

Simple merge