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

Merge branch 'master' into update-objc

Browse Source 
Conflicts:
	AsyncDisplayKit/ASCollectionView.h
	AsyncDisplayKit/ASTableView.h
	AsyncDisplayKit/Details/ASLayoutController.h
	AsyncDisplayKit/Details/ASRangeController.h
This commit is contained in:
Adlai Holler
2015-11-24 16:40:03 -08:00
parent ecaabc8435 50a52e7112
commit dfc098fc20
12 changed files with 200 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKit/Details/ASAbstractLayoutController.h
View File

@@ -17,8 +17,6 @@ NS_ASSUME_NONNULL_BEGIN
- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType;
@property (nonatomic, assign) ASRangeTuningParameters tuningParameters ASDISPLAYNODE_DEPRECATED;
@end
NS_ASSUME_NONNULL_END