mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2025-01-09 15:52:44 +01:00
d64a06aa9d
# Conflicts: # Mastodon.xcodeproj/project.pbxproj # Mastodon/Service/APIService/APIService+Status.swift # MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Statuses.swift |
||
---|---|---|
.. | ||
project.xcworkspace | ||
xcuserdata/mainasuk.xcuserdatad/xcschemes | ||
project.pbxproj |