CMK 1c6f231fee Merge branch /develop into feature/in-reply-to-header ... # Conflicts: # Localization/app.json # Mastodon.xcodeproj/project.pbxproj # Mastodon/Diffiable/Section/StatusSection.swift # Mastodon/Resources/en.lproj/Localizable.strings # MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift		2021-03-16 11:41:56 +08:00
..
Application.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
Attachment.swift	chore: make media_attachments.preview_url optional	2021-03-09 14:25:19 +08:00
Emoji.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
History.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
HomeTimelineIndex.swift	feat: HomeTimeline	2021-02-07 16:19:33 +08:00
MastodonAuthentication.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
MastodonUser.swift	feat: make poll cell label appearance update according to the underneath background	2021-03-03 19:34:29 +08:00
Mention.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
Poll.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
PollOption.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
Tag.swift	chore: use setPrimitiveValue	2021-03-06 13:04:30 +08:00
Toot.swift	Merge branch /develop into feature/in-reply-to-header	2021-03-16 11:41:56 +08:00