Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

Browse Source

# Conflicts:
#	Source/ASVideoPlayerNode.h
#	Source/Details/ASElementMap.mm
#	Source/Details/_ASCollectionReusableView.mm
#	Source/Details/_ASCollectionViewCell.mm
#	Source/Private/ASMutableElementMap.mm

...

This commit is contained in:

Peter Iakovlev

2018-11-16 14:41:49 +04:00

parent 4decd73217 771c068ad6

commit fb270baddd

223 changed files with 3785 additions and 3054 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1244

AsyncDisplayKit.xcodeproj/project.pbxproj

File diff suppressed because it is too large Load Diff