Kris Aubuchon 328f9a4a39 Merge remote-tracking branch 'upstream/master'		2014-07-25 00:19:38 -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	FIX: remove invalid hack, correct whitelist to use value returned from callback	2014-07-25 12:16:00 +10:00
stylesheets	Merge remote-tracking branch 'upstream/master'	2014-07-25 00:19:38 -04:00