CMK 060aec6bcb Merge branch 'release-1.4.6' into feature/package-refactor ... # Conflicts: # .arkana.yml # AppShared/Info.plist # Documentation/Setup.md # Gemfile # Gemfile.lock # Mastodon.xcodeproj/project.pbxproj # Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist # Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved # MastodonSDK/Package.swift # MastodonSDK/Sources/MastodonCore/AppSecret.swift # MastodonSDK/Sources/MastodonCore/Service/Notification/NotificationService.swift # Podfile # Podfile.lock		2022-11-01 14:14:00 +08:00
..
Assets.xcassets	feat: restore compose poll options	2022-10-26 18:35:10 +08:00
Font	feat: update report flow	2022-02-08 12:36:06 +08:00
Generated	Merge branch 'release-1.4.6' into feature/package-refactor	2022-11-01 14:14:00 +08:00
MastodonAsset+Bundle.swift	feat: adapt the app to async & await. Update timeline UI	2022-01-27 21:23:39 +08:00