zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity
mastodon-ios/Mastodon/Scene
History
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
..
Account Use account on account-switcher (IOS-192) 2024-01-05 12:56:08 +01:00
Compose Remove Status from CoreData (#1167) 2024-01-08 11:17:40 +01:00
Discovery Merge branch 'develop' into ios-192-profile-about 2024-01-31 15:36:53 +01:00
HashtagTimeline Merge branch 'develop' into ios-192-profile-about 2024-01-31 15:36:53 +01:00
HomeTimeline Merge branch 'develop' into ios-192-profile-about 2024-01-31 15:36:53 +01:00
MediaPreview Make image clickable again (IOS-192) 2023-12-31 12:57:56 +01:00
Notification Merge branch 'develop' into ios-192-profile-about 2024-01-31 15:36:53 +01:00
Onboarding Reduce nested-ness of tasks (IOS-192) 2024-01-11 15:28:18 +01:00
Profile Merge branch 'develop' into ios-192-profile-about 2024-01-31 15:36:53 +01:00
Report Merge branch 'develop' into ios-192-profile-about 2024-01-08 22:32:57 +01:00
Root Fix profile-button (IOS-192) 2024-01-12 10:47:17 +01:00
Search Merge branch 'develop' into ios-192-profile-about 2024-01-31 15:36:53 +01:00
Settings Move task and async/await to call-site (IOS-192) 2024-01-09 17:45:01 +01:00
Share Merge branch 'develop' into ios-192-profile-about 2024-01-31 15:36:53 +01:00
SuggestionAccount Move task and async/await to call-site (IOS-192) 2024-01-09 17:45:01 +01:00
Thread Merge branch 'develop' into ios-192-profile-about 2024-01-31 15:36:53 +01:00
Transition More cleanup 2023-09-22 15:27:46 +02:00