Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-05-05 21:28:18 +00:00
commit d421c031fc
2 changed files with 2 additions and 3 deletions

View file

@ -163,8 +163,7 @@ export default class extends React.Component {
return this.state.decryptedUrl;
} else if (content.info &&
content.info.mimetype == "image/svg+xml" &&
content.info.thumbnail_url)
{
content.info.thumbnail_url) {
// special case to return client-generated thumbnails for SVGs, if any,
// given we deliberately don't thumbnail them serverside to prevent
// billion lol attacks and similar