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 |
|