Merge "Fix mime detection of easily-confused-with text/plain formats"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 4 Jul 2014 07:43:42 +0000 (07:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 4 Jul 2014 07:43:42 +0000 (07:43 +0000)
commit79d908ef74ba0d222515cdce06d4ba4e70580a79
tree0b63aa610bd840ec0eefa31885c3b92cebb142c8
parent7155d17757b8e93105097ababd2b98ad5013002d
parent69905ce9c7dc2a5dcc2f0c6fee424d307d297e8e
Merge "Fix mime detection of easily-confused-with text/plain formats"
includes/MimeMagic.php
includes/mime.info
includes/mime.types
includes/upload/UploadBase.php