Mark Otto 2aa1a4dc70 Merge branch 'master' into 3.0.0-wip ... Conflicts: docs/assets/js/bootstrap.min.js		2013-02-07 22:18:53 -08:00
..
css	finish modal tweaks	2013-02-07 19:31:12 -08:00
fonts	removing glyphicons images, swapping in new icon font with new classes	2012-11-02 01:20:06 -07:00
ico	fixes #5717: add retina favicon, recompile docs	2012-10-31 10:41:41 -07:00
img	add codecademy to gallery	2013-02-05 21:07:30 -08:00
js	Merge branch 'master' into 3.0.0-wip	2013-02-07 22:18:53 -08:00