fbe3a8c419
# Conflicts: # Mastodon.xcodeproj/project.pbxproj # Mastodon/Coordinator/SceneCoordinator.swift # Mastodon/Scene/Share/View/Content/StatusView.swift # Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift |
||
---|---|---|
.. | ||
StatusProvider | ||
UserProvider | ||
AvatarConfigurableView.swift | ||
ContentOffsetAdjustableTimelineViewControllerDelegate.swift | ||
DisposeBagCollectable.swift | ||
LoadMoreConfigurableTableViewContainer.swift | ||
NeedsDependency+AVPlayerViewControllerDelegate.swift | ||
ScrollViewContainer.swift | ||
TableViewCellHeightCacheableContainer.swift |