ihugo f6dabb5e36 Merge branch 'develop' into feature/settings-rebase ... # Conflicts: # CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents # Localization/app.json # Mastodon/Generated/Assets.swift # Mastodon/Generated/Strings.swift # Mastodon/Resources/en.lproj/Localizable.strings # Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift		2021-04-17 14:13:01 +08:00
..
Application.swift	feat: [WIP] add profile scene	2021-04-01 14:39:15 +08:00
Attachment.swift	feat: [WIP] add profile scene	2021-04-01 14:39:15 +08:00
Emoji.swift	feat: [WIP] add profile scene	2021-04-01 14:39:15 +08:00
History.swift	fix: tag and searchHistory repeated save in CoreDate	2021-04-08 12:22:05 +08:00
HomeTimelineIndex.swift	feat: [WIP] add profile scene	2021-04-01 14:39:15 +08:00
MastodonAuthentication.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
MastodonUser.swift	feat: handle suspended account in profile scene	2021-04-08 17:06:03 +08:00
Mention.swift	feat: implement reply status entry and update query of API	2021-04-14 15:59:29 +08:00
Poll.swift	feat: [WIP] add profile scene	2021-04-01 14:39:15 +08:00
PollOption.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
PrivateNote.swift	feat: [WIP] add profile scene	2021-04-01 14:39:15 +08:00
SearchHistory.swift	fix: tag and searchHistory repeated save in CoreDate	2021-04-08 12:22:05 +08:00
Setting.swift	feature: settings	2021-04-13 17:15:58 +08:00
Status.swift	feat: [WIP] add profile scene	2021-04-01 14:39:15 +08:00
Subscription.swift	fixed: subscription API call	2021-04-13 17:15:58 +08:00
SubscriptionAlerts.swift	fix: use right privacyURL	2021-04-17 14:01:57 +08:00
Tag.swift	fix: tag and searchHistory repeated save in CoreDate	2021-04-08 12:22:05 +08:00