]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Mon, 27 Jan 2014 17:42:33 +0000 (09:42 -0800)
committerMark Otto <otto@github.com>
Mon, 27 Jan 2014 17:42:33 +0000 (09:42 -0800)
1  2 
docs/javascript.html

Simple merge