]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip
authorMark Otto <markotto@twitter.com>
Tue, 28 Feb 2012 05:22:20 +0000 (21:22 -0800)
committerMark Otto <markotto@twitter.com>
Tue, 28 Feb 2012 05:22:20 +0000 (21:22 -0800)
commit5cc4fcf6a2ace006b8b4023c3e75d819d611b2e1
treedaa7f9bc48b416aefca6e4b99830475e093e0c51
parent4e17b1975e1b38e3a1fe7851a0b59c645dba755f
parentbe9ae7006033f2be11f3547f30425417830158ba
Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip

Conflicts:
docs/javascript.html
docs/templates/pages/javascript.mustache
docs/assets/bootstrap.zip
docs/javascript.html
docs/templates/pages/javascript.mustache