Kingfisher into Palringo-master

Commit

4 years ago

Merge branch 'master' of https://github.com/Palringo/Kingfisher into Palringo-master # Conflicts: # Kingfisher.xcodeproj/project.pbxproj # Sources/General/Kingfisher.swift

Author

onevcat

Parents

fd6aee6d

ecdd188d

Kingfisher 2fb32b7d - Merge branch 'master' of https://github.com/Palringo/Kingfisher into Palringo-master

Kingfisher
2fb32b7d - Merge branch 'master' of https://github.com/Palringo/Kingfisher into Palringo-master