CMK 43c8cd51b6 Merge branch 'feature-purple-tint' into release-1.4.5 ... # Conflicts: # AppShared/Info.plist # Mastodon.xcodeproj/project.pbxproj # Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist # Mastodon/Info.plist # MastodonIntent/Info.plist # MastodonTests/Info.plist # MastodonUITests/Info.plist # NotificationService/Info.plist # ShareActionExtension/Info.plist		2022-07-01 14:01:16 +08:00
..
CoreDataStack	feat: add follow request notification UX. resolve #390 #458	2022-06-30 15:02:24 +08:00
MastodonAsset	Merge branch 'feature-purple-tint' into release-1.4.5	2022-07-01 14:01:16 +08:00
MastodonCommon	chore: rearrange package dependency to fix CI build issue	2022-04-29 14:38:18 +08:00
MastodonExtension	feat: add hashtag and news list for Discovery scene	2022-04-13 20:43:16 +08:00
MastodonLocalization	chore: update i18n resources	2022-06-30 15:53:05 +08:00
MastodonSDK	feat: add interaction for follow request notification	2022-06-28 19:00:39 +08:00
MastodonUI	Merge branch 'feature-purple-tint' into release-1.4.5	2022-07-01 14:01:16 +08:00