Kris Aubuchon 5c3f12f369 merging ... Merge remote-tracking branch 'upstream/master'		2013-11-04 12:59:17 -05:00
..
fonts	upgrade font awesome to version 3.2.1, use scss instead of css for the include.	2013-07-09 10:06:57 +10:00
images	PNG Files optimization	2013-08-22 14:00:25 +02:00
javascripts	FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available.	2013-11-04 12:51:09 -05:00
stylesheets	merging	2013-11-04 12:59:17 -05:00