Merge branch 'master' of https://github.com/rs/SDWebImage into 5.x

# Conflicts:
#	SDWebImage/NSData+ImageContentType.h
#	SDWebImage/SDWebImageDownloader.m
#	SDWebImage/SDWebImageImageIOCoder.m
This commit is contained in:
DreamPiggy
2018-08-10 15:20:55 +08:00
6 changed files with 84 additions and 14 deletions
@@ -70,6 +70,7 @@
@"http://littlesvr.ca/apng/images/SteamEngine.webp",
@"http://littlesvr.ca/apng/images/world-cup-2014-42.webp",
@"https://isparta.github.io/compare-webp/image/gif_webp/webp/2.webp",
@"https://nokiatech.github.io/heif/content/images/ski_jump_1440x960.heic",
@"https://nr-platform.s3.amazonaws.com/uploads/platform/published_extension/branding_icon/275/AmazonS3.png",
@"http://via.placeholder.com/200x200.jpg",
nil];