DreamPiggy b866c6aa97 Merge branch 'master' of https://github.com/SDWebImage/SDWebImage into 5.x ... # Conflicts: # CHANGELOG.md # SDWebImage.podspec # SDWebImage.xcodeproj/project.pbxproj # SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.m # SDWebImage/SDImageCache.m # SDWebImage/SDWebImageDownloaderOperation.m # SDWebImage/UIView+WebCache.m # Tests/SDWebImage Tests.xcodeproj/project.pbxproj		2019-01-03 14:54:37 +08:00
..
xcshareddata/xcschemes	Xcode 10 - upgraded schemes, using xcode10 Travis image, removed some deprecated methods from our demos + formatting	2018-11-11 20:19:33 -06:00
project.pbxproj	Merge branch 'master' of https://github.com/SDWebImage/SDWebImage into 5.x	2019-01-03 14:54:37 +08:00