Merge https://github.com/friendica/red into pending_merge

2015-02-01 15:15:52 -08:00
parent b1a92d620e e238b639f8
commit 9bef0d5e14
2 changed files with 4 additions and 3 deletions
@@ -2388,6 +2388,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