Kris Aubuchon 5aaaa9b915 Merge remote-tracking branch 'upstream/master' ... Conflicts: app/assets/stylesheets/desktop/topic-post.scss		2014-07-10 11:45:25 -04:00
..
fonts	FEATURE: upgrade font awesome to head	2014-07-03 17:58:12 +10:00
images	feature: use select2 instead of chosen	2014-05-14 08:01:08 +00:00
javascripts	add badge glyph to edit button	2014-07-09 22:01:03 -07:00
stylesheets	Merge remote-tracking branch 'upstream/master'	2014-07-10 11:45:25 -04:00