1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-01-24 06:24:02 +01:00
mastodon-app-ufficiale-ipho.../Mastodon.xcodeproj/xcuserdata
CMK 2e9af9c9cb Merge /develop into feature/poll
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
#	Mastodon/Diffiable/Item/Item.swift
2021-03-07 22:26:05 +08:00
..
mainasuk.xcuserdatad/xcschemes Merge /develop into feature/poll 2021-03-07 22:26:05 +08:00