b2dbcc8095
# Conflicts: # Mastodon/Protocol/Provider/DataSourceProvider+NotificationTableViewCellDelegate.swift # Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController+DataSourceProvider.swift # MastodonSDK/Sources/MastodonCore/DataController/FeedDataController.swift # MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift |
||
---|---|---|
.. | ||
FavoriteViewController+DataSourceProvider.swift | ||
FavoriteViewController.swift | ||
FavoriteViewModel+Diffable.swift | ||
FavoriteViewModel+State.swift | ||
FavoriteViewModel.swift |