0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00
Mark Otto 5cc4fcf6a2 Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip
Conflicts:
	docs/javascript.html
	docs/templates/pages/javascript.mustache
2012-02-27 21:22:20 -08:00
..
2012-02-12 11:08:58 -08:00