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
..
NotificationTimelineViewController+DataSourceProvider.swift	Merge branch 'develop' into ios-192-profile-about	2024-01-31 15:36:53 +01:00
NotificationTimelineViewController.swift	Make follow-requests work again (IOS-192)	2024-01-30 11:13:39 +01:00
NotificationTimelineViewModel+Diffable.swift	Improve status updating mechanism (#1210)	2024-01-30 23:02:13 +01:00
NotificationTimelineViewModel+LoadOldestState.swift	Fix warnings	2024-01-08 22:48:35 +01:00
NotificationTimelineViewModel.swift	[WIP] Add relationships/user to notifications (IOS-192)	2024-01-16 17:12:47 +01:00