Merge remote-tracking branch 'upstream/release-v1.33.0'

This commit is contained in:
Tulir Asokan 2021-04-28 14:15:25 +03:00
commit c9cee6c534
685 changed files with 4011 additions and 2719 deletions

View file

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2014, 2015 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
@ -72,6 +71,7 @@ def parse_thumbnail_requirements(thumbnail_sizes):
png_thumbnail = ThumbnailRequirement(width, height, method, "image/png")
webp_thumbnail = ThumbnailRequirement(width, height, method, "image/webp")
requirements.setdefault("image/jpeg", []).append(jpeg_thumbnail)
requirements.setdefault("image/jpg", []).append(jpeg_thumbnail)
requirements.setdefault("image/webp", []).append(webp_thumbnail)
requirements.setdefault("image/gif", []).append(png_thumbnail)
requirements.setdefault("image/png", []).append(png_thumbnail)