060aec6bcb
# 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 |
||
---|---|---|
.. | ||
CoreDataStack | ||
MastodonAsset | ||
MastodonCommon | ||
MastodonCore | ||
MastodonExtension | ||
MastodonLocalization | ||
MastodonSDK | ||
MastodonUI |