Merge branch 'fix-tootdon-image-uploads' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 9 Nov 2017 14:41:44 +0000 (14:41 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 9 Nov 2017 14:41:44 +0000 (14:41 +0000)
commit2247d7580e2873e08aba614f815917f9ed37ed83
tree37972725212826694da47dff621d95a955c4fe0e
parentccde03285debe8def5d89d49b9afdcc48a76d7a6
parente942e1e5528f587d2d5411f235d17599965f0f85
Merge branch 'fix-tootdon-image-uploads' into 'develop'

Correct mimetype on bad uploads.

See merge request pleroma/pleroma!12