fbe3a8c419
# Conflicts: # Mastodon.xcodeproj/project.pbxproj # Mastodon/Coordinator/SceneCoordinator.swift # Mastodon/Scene/Share/View/Content/StatusView.swift # Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift |
||
---|---|---|
.. | ||
Header | ||
Segmented | ||
Timeline | ||
CachedProfileViewModel.swift | ||
MeProfileViewModel.swift | ||
ProfileViewController+UserProvider.swift | ||
ProfileViewController.swift | ||
ProfileViewModel.swift | ||
RemoteProfileViewModel.swift |