2 Commits

Author	SHA1	Message	Date
Peter	e7b34f5811	Merge commit '404795dc02aa57b167223bfaee7c380907022ca1' ... # Conflicts: # AsyncDisplayKit.xcodeproj/project.pbxproj # AsyncDisplayKit/ASCellNode+Internal.h # AsyncDisplayKit/ASCellNode.mm # AsyncDisplayKit/ASCollectionNode+Beta.h # AsyncDisplayKit/ASCollectionNode.mm # AsyncDisplayKit/ASCollectionView.mm # AsyncDisplayKit/ASCollectionViewProtocols.h # AsyncDisplayKit/ASDisplayNode.mm # AsyncDisplayKit/ASMultiplexImageNode.h # AsyncDisplayKit/ASMultiplexImageNode.mm # AsyncDisplayKit/ASNavigationController.m # AsyncDisplayKit/ASNetworkImageNode.mm # AsyncDisplayKit/ASPagerFlowLayout.m # AsyncDisplayKit/ASPagerNode.m # AsyncDisplayKit/ASTabBarController.m # AsyncDisplayKit/ASTableNode.h # AsyncDisplayKit/ASTableNode.mm # AsyncDisplayKit/ASTableView.mm # AsyncDisplayKit/ASTableViewProtocols.h # AsyncDisplayKit/ASVideoNode.h # AsyncDisplayKit/ASVideoNode.mm # AsyncDisplayKit/ASVideoPlayerNode.mm # AsyncDisplayKit/ASViewController.mm # AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.m # AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.m # AsyncDisplayKit/Details/ASBasicImageDownloader.mm # AsyncDisplayKit/Details/ASBatchContext.mm # AsyncDisplayKit/Details/ASChangeSetDataController.h # AsyncDisplayKit/Details/ASChangeSetDataController.mm # AsyncDisplayKit/Details/ASCollectionDataController.mm # AsyncDisplayKit/Details/ASCollectionViewLayoutController.mm # AsyncDisplayKit/Details/ASCollectionViewLayoutInspector.m # AsyncDisplayKit/Details/ASDataController.mm # AsyncDisplayKit/Details/ASFlowLayoutController.h # AsyncDisplayKit/Details/ASFlowLayoutController.mm # AsyncDisplayKit/Details/ASIndexedNodeContext.mm # AsyncDisplayKit/Details/ASPhotosFrameworkImageRequest.h # AsyncDisplayKit/Details/ASPhotosFrameworkImageRequest.m # AsyncDisplayKit/Details/ASRangeController.mm # AsyncDisplayKit/Details/ASRangeControllerUpdateRangeProtocol+Beta.h # AsyncDisplayKit/Details/ASSectionContext.h # AsyncDisplayKit/Private/ASBatchFetching.m # AsyncDisplayKit/Private/ASCollectionView+Undeprecated.h # AsyncDisplayKit/Private/ASCollectionViewFlowLayoutInspector.h # AsyncDisplayKit/Private/ASCollectionViewFlowLayoutInspector.m # AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm # AsyncDisplayKit/Private/_ASPendingState.mm # examples/SocialAppLayout-Inverted/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme	2017-02-02 11:46:47 +03:00
Adlai Holler	404795dc02	Remove Support for iOS 7 (#2930) ... * Drop support for iOS 7 * Copy reference images * Update deployment for sample projects * Update version * Update "Life Without Cocoapods"	2017-02-01 14:40:37 -08:00