fat fe7fffe034 Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset ... Conflicts: js/tests/unit/carousel.js		2013-12-24 12:50:55 -08:00
..
css	Team members on About page	2013-12-21 10:08:04 -08:00
ico	Fixes #11975: Change from png to .ico for favicon	2013-12-23 15:16:25 -08:00
js	Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset	2013-12-24 12:50:55 -08:00