mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2025-01-24 14:30:47 +01:00
f0b08e2b56
# Conflicts: # Mastodon.xcodeproj/project.pbxproj # Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist # Mastodon/Extension/MastodonSDK/Mastodon+Entidy+ErrorDetailReason.swift |
||
---|---|---|
.. | ||
project.xcworkspace | ||
xcuserdata/mainasuk.xcuserdatad/xcschemes | ||
project.pbxproj |