mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2025-01-09 15:52:44 +01:00
6e87b581b9
# Conflicts: # Mastodon.xcodeproj/project.pbxproj # Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift # Mastodon/State/AppContext.swift # MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Statuses.swift # MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift |
||
---|---|---|
.. | ||
project.xcworkspace | ||
xcuserdata/mainasuk.xcuserdatad/xcschemes | ||
project.pbxproj |