mastodon-ios/Mastodon/Scene/Search
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
..
Search Simplify Theme (#1121) 2023-09-27 15:08:12 +02:00
SearchDetail Merge branch 'develop' into ios-192-profile-about 2024-01-31 15:36:53 +01:00