Bogdan Poplauschi 17d8690127 Merge branch '4.x' into gif ... # Conflicts: # SDWebImage/MKAnnotationView+WebCache.h # SDWebImage/MKAnnotationView+WebCache.m # SDWebImage/SDImageCache.h # SDWebImage/SDImageCache.m # SDWebImage/SDWebImageManager.h # SDWebImage/SDWebImageManager.m # SDWebImage/UIButton+WebCache.h # SDWebImage/UIButton+WebCache.m # SDWebImage/UIImageView+HighlightedWebCache.h # SDWebImage/UIImageView+HighlightedWebCache.m # SDWebImage/UIImageView+WebCache.h # SDWebImage/UIImageView+WebCache.m		2016-06-07 12:42:26 +03:00
..
xcshareddata/xcschemes	Schemes update (naming)	2016-05-10 08:37:12 +03:00
project.pbxproj	Merge branch '4.x' into gif	2016-06-07 12:42:26 +03:00