ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into AdvancedPhotos

Browse Source 
Conflicts:
	AsyncDisplayKit/ASMultiplexImageNode.mm
This commit is contained in:
Adlai Holler
2015-10-02 12:45:49 -07:00
parent de1f9788f3 fd88522f84
commit 35c118aff0
35 changed files with 1136 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AsyncDisplayKit/ASMultiplexImageNode.mm
View File

@@ -158,7 +158,8 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent
_cache = cache;
_downloader = downloader;
_imageManager = PHImageManager.defaultManager;
self.shouldBypassEnsureDisplay = YES;
return self;
}