1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-01-09 15:52:44 +01:00
mastodon-app-ufficiale-ipho.../Mastodon.xcodeproj
CMK 499ddeb169 Merge branch 'develop' into feature/profile
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Localization/app.json
#	Mastodon.xcodeproj/project.pbxproj
2021-04-01 14:53:24 +08:00
..
project.xcworkspace
xcuserdata/mainasuk.xcuserdatad/xcschemes Merge branch /develop into feature/in-reply-to-header 2021-03-16 11:41:56 +08:00
project.pbxproj Merge branch 'develop' into feature/profile 2021-04-01 14:53:24 +08:00