mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2025-01-09 15:52:44 +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 |
||
---|---|---|
.. | ||
CondensedUserView.swift | ||
ExpandableMediaBadge.swift | ||
FamiliarFollowersDashboardView.swift | ||
FamiliarFollowersDashboardView+Configuration.swift | ||
FamiliarFollowersDashboardView+ViewModel.swift | ||
InlineMediaOverlayContainer.swift | ||
MediaBadge.swift | ||
MediaView.swift | ||
MediaView+Configuration.swift | ||
NewsView.swift | ||
NewsView+Configuration.swift | ||
PollOptionView.swift | ||
PollOptionView+ViewModel.swift | ||
StatusAuthorView.swift | ||
StatusCardControl.swift | ||
StatusMetricRowView.swift | ||
StatusMetricView.swift | ||
StatusView.swift | ||
StatusView+Configuration.swift | ||
StatusView+ViewModel.swift | ||
TrendView.swift | ||
TrendView+Configuration.swift | ||
UserView.swift | ||
UserView+ViewModel.swift |