Nathan Mattes b2dbcc8095 Merge branch 'develop' into ios-192-profile-about ... # 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		2024-01-31 15:36:53 +01:00
..
FeedDataController.swift	Merge branch 'develop' into ios-192-profile-about	2024-01-31 15:36:53 +01:00