499ddeb169
# Conflicts: # CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents # Localization/app.json # Mastodon.xcodeproj/project.pbxproj |
||
---|---|---|
.. | ||
CoreData.xcdatamodel |
499ddeb169
# Conflicts: # CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents # Localization/app.json # Mastodon.xcodeproj/project.pbxproj |
||
---|---|---|
.. | ||
CoreData.xcdatamodel |