mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2024-12-08 06:42:04 +01:00
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 |
||
---|---|---|
.. | ||
SettingFetchedResultController.swift | ||
StatusDataController.swift |