mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2025-01-09 15:52:44 +01:00
1c6f231fee
# Conflicts: # Localization/app.json # Mastodon.xcodeproj/project.pbxproj # Mastodon/Diffiable/Section/StatusSection.swift # Mastodon/Resources/en.lproj/Localizable.strings # MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift |
||
---|---|---|
.. | ||
project.xcworkspace | ||
xcuserdata/mainasuk.xcuserdatad/xcschemes | ||
project.pbxproj |