Merge branch 'master' into tres

2015-02-01 20:30:47 -08:00
parent e6a5f78003 e58bef049d
commit aafed50a0e
12 changed files with 108 additions and 10 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -2387,6 +2387,7 @@ function getIconFromType($type) {
 	$iconMap = array(
 		//Folder
 		t('Collection') => 'icon-folder-close',
+		'multipart/mixed' => 'icon-folder-close', //dirs in attach use this mime type
 		//Common file
 		'application/octet-stream' => 'icon-file-alt',
 		//Text