CMK 5d52fc4578 Merge branch develop into feature/push-notification ... # Conflicts: # Mastodon.xcodeproj/project.pbxproj # Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift # Mastodon/Scene/Settings/SettingsViewModel.swift		2021-04-27 18:16:56 +08:00
..
CategoryPickerItem.swift	feat: add poll UI/UX for compose scene	2021-03-23 18:47:21 +08:00
ComposeStatusItem.swift	feat: add content warning editor for status compose scene	2021-03-25 18:17:05 +08:00
CustomEmojiPickerItem.swift	feat: implement emoji picker	2021-03-25 15:56:17 +08:00
Item.swift	fix: add selection state of report status	2021-04-23 09:37:18 +08:00
NotificationItem.swift	feat: make content warning works in the notification scene	2021-04-20 13:18:27 +08:00
PickServerItem.swift	Merge /develop into feature/poll	2021-03-07 22:26:05 +08:00
PollItem.swift	feat: add poll UI/UX for compose scene	2021-03-23 18:47:21 +08:00
SearchResultItem.swift	chore: rename hashTag to hashtag	2021-04-07 21:01:32 +08:00
SelectedAccountItem.swift	fix: update followState when view will appear	2021-04-22 20:35:41 +08:00
SettingsItem.swift	feat: make push notification trigger update when change setting	2021-04-26 16:57:50 +08:00