CMK 6e87b581b9 Merge branch /develop into feature/in-reply-to-header ... # Conflicts: # Mastodon.xcodeproj/project.pbxproj # Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift # Mastodon/State/AppContext.swift # MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Statuses.swift # MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift		2021-03-17 11:24:25 +08:00
..
CollectionViewCell	feat: make diffable data source works with category picker	2021-03-06 14:46:04 +08:00
TableViewCell	chore: rename toot	2021-03-15 13:42:46 +08:00
View	feat: make diffable data source works with category picker	2021-03-06 14:46:04 +08:00
MastodonPickServerAppearance.swift	feat: set corner radius for the last cell layer	2021-03-06 13:30:06 +08:00
MastodonPickServerViewController.swift	feat: add reply to header for toot	2021-03-10 19:12:53 +08:00
MastodonPickServerViewModel+Diffable.swift	feat: make diffable data source works with category picker	2021-03-06 14:46:04 +08:00
MastodonPickServerViewModel+LoadIndexedServerState.swift	feat: add reply to header for toot	2021-03-10 19:12:53 +08:00
MastodonPickServerViewModel.swift	feat: add reply to header for toot	2021-03-10 19:12:53 +08:00