Mark Otto 5c2dfbf33b Merge branch 'master' of github.com:twbs/bootstrap ... Conflicts: docs-assets/js/raw-files.js		2013-12-24 12:17:48 -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 'master' of github.com:twbs/bootstrap	2013-12-24 12:17:48 -08:00