2 Commits

Author SHA1 Message Date
Peter
7617b9a9f3 Merge commit 'e6ee24debcae89bd0066061b42ad1a6a73da9486'
# Conflicts:
#	Source/ASDisplayNode.mm
#	Source/ASImageNode.mm
#	Source/Details/ASCollectionViewLayoutController.mm
2017-03-15 13:31:39 +03:00
Adlai Holler
d59ea3902d Initial Work for Range Controller to Support Supplementary Elements (#3140)
* Initial work supporting supplementaries in range controller

* Rename indexPathForElementIfItem
2017-03-06 10:11:00 -08:00