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
..
ProfileFieldCollectionViewHeaderFooterView.swift	feat: adapt the app to async & await. Update timeline UI	2022-01-27 21:23:39 +08:00
ProfileHeaderView+Configuration.swift	fix: use acct instead of username in profile header view	2022-06-05 16:41:47 +08:00
ProfileHeaderView+ViewModel.swift	chore: move core logic into package	2022-10-08 13:43:06 +08:00
ProfileHeaderView.swift	Merge branch 'release-1.4.6' into feature/package-refactor	2022-11-01 14:14:00 +08:00