1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-01-23 22:11:22 +01:00
mastodon-app-ufficiale-ipho.../Mastodon.xcodeproj
CMK f8127428dd Merge branch 'develop' into feature/content-warning
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
2021-04-19 19:32:16 +08:00
..
project.xcworkspace Initial Commit 2021-01-22 13:54:11 +08:00
xcuserdata/mainasuk.xcuserdatad/xcschemes fix: blurhash image render issue 2021-04-16 20:29:08 +08:00
project.pbxproj Merge branch 'develop' into feature/content-warning 2021-04-19 19:32:16 +08:00