]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'bradly-affix-docs-fix' into 2.2.2-wip
authorMark Otto <otto@github.com>
Wed, 31 Oct 2012 17:48:44 +0000 (10:48 -0700)
committerMark Otto <otto@github.com>
Wed, 31 Oct 2012 17:48:44 +0000 (10:48 -0700)
1  2 
docs/javascript.html

Simple merge