1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-01-24 14:30:47 +01:00
mastodon-app-ufficiale-ipho.../Mastodon.xcodeproj
CMK fbe3a8c419 Merge branch 'develop' into feature/profile-coordinator
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Coordinator/SceneCoordinator.swift
#	Mastodon/Scene/Share/View/Content/StatusView.swift
#	Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift
2021-04-07 16:55:07 +08:00
..
project.xcworkspace
xcuserdata/mainasuk.xcuserdatad/xcschemes
project.pbxproj Merge branch 'develop' into feature/profile-coordinator 2021-04-07 16:55:07 +08:00