]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'Justin-John-master' into 2.3.0-wip
authorMark Otto <otto@github.com>
Thu, 10 Jan 2013 05:35:50 +0000 (21:35 -0800)
committerMark Otto <otto@github.com>
Thu, 10 Jan 2013 05:35:50 +0000 (21:35 -0800)
1  2 
carousel.html

diff --cc carousel.html
Simple merge