Mark Otto d88e743b41 Merge branch 'master' of github.com:twbs/bootstrap ... Conflicts: dist/css/bootstrap.min.css		2013-09-11 16:35:27 -07:00
..
css	fixes #10526: Remove custom background on responsive tables and set it in the docs where it should've been originally	2013-09-08 20:03:52 -07:00
ico	Remove multiple touch icons and roll with a single one	2013-09-10 21:46:12 -07:00
js	Merge branch 'master' of github.com:twbs/bootstrap	2013-09-11 16:35:27 -07:00