mastodon-ios/Mastodon
NanoSector 85ffc88d2a
Merge branch 'develop' into feature/385-paste-from-clipboard
Signed-off-by: NanoSector <rick@nanosector.nl>

# Conflicts:
#	Mastodon/Scene/Compose/ComposeViewController.swift
2022-11-01 19:29:22 +01:00
..
Activity chore: update i18n for open link words 2022-03-10 16:20:42 +08:00
Coordinator Merge branch 'release-1.4.6' into feature/package-refactor 2022-11-01 14:14:00 +08:00
Diffiable chore: [WIP] restore the replyTo entry for compose 2022-10-10 19:14:52 +08:00
Extension chore: [WIP] restore the replyTo entry for compose 2022-10-10 19:14:52 +08:00
Generated feat: add reblogged by and favorited by user list entry for status 2022-05-17 22:09:43 +08:00
Helper chore: [WIP] move core logic into package 2022-09-30 19:28:09 +08:00
Preference chore: [WIP] move core logic into package 2022-09-30 19:28:09 +08:00
Protocol chore: cherry pick 00eddc2aae from feature-post-edit branch 2022-11-01 14:34:00 +08:00
Resources chore: update app icon 2022-06-15 12:58:40 +08:00
Scene Merge branch 'develop' into feature/385-paste-from-clipboard 2022-11-01 19:29:22 +01:00
Supporting Files Merge branch 'release-1.4.6' into feature/package-refactor 2022-11-01 14:14:00 +08:00
Template feat: adapt the app to async & await. Update timeline UI 2022-01-27 21:23:39 +08:00
Vender chore: [WIP] restore the replyTo entry for compose 2022-10-10 19:14:52 +08:00
.sourcery.yml feat: adapt the app to async & await. Update timeline UI 2022-01-27 21:23:39 +08:00
Info.plist feat: add unread notification shortcut handler and updater 2022-07-27 17:39:27 +08:00
Mastodon.entitlements feat: add Send Post Siri intent 2021-07-26 20:23:52 +08:00
Mastodon.xctestplan chore: add smoke UI tests 2021-08-10 14:59:44 +08:00