Brentley Jones 5e08427dd3 Merge branch 'master' into fixed_modals ... Conflicts: app/assets/javascripts/discourse/templates/modal/modal.js.handlebars app/assets/stylesheets/application/modal.css.scss		2013-07-16 18:58:49 +00:00
..
admin	Add blocked users count to dashboard	2013-07-08 12:44:13 -04:00
application	FIX: Bootbox modals were not coming through properly. Temp have them use the old way of displaying. Will look into how to have them be the same as the "fixed" way.	2013-07-16 18:32:35 +00:00
components	fix mucked up styling, glyph should be inside the hyperlink so it gets color	2013-07-16 18:01:34 +10:00
foundation	we need overflow auto on code blocks	2013-06-20 17:46:18 +10:00
vendor	upgrade font awesome to version 3.2.1, use scss instead of css for the include.	2013-07-09 10:06:57 +10:00
admin.css	* event machine fix is critical (long polling has been broken)	2013-04-19 13:06:00 +10:00
application.css.erb	upgrade font awesome to version 3.2.1, use scss instead of css for the include.	2013-07-09 10:06:57 +10:00