mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2024-12-12 00:25:36 +01:00
499ddeb169
# Conflicts: # CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents # Localization/app.json # Mastodon.xcodeproj/project.pbxproj |
||
---|---|---|
.. | ||
xcshareddata | ||
contents.xcworkspacedata |