mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2024-12-12 16:46:32 +01:00
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 |
||
---|---|---|
.. | ||
Assets.swift | ||
Fonts.swift |