mirror of
https://github.com/ProtonMail/ios-mail.git
synced 2026-06-14 09:54:45 +00:00
Maciej Gomółka
4727fca432
# Conflicts: # Modules/App/Sources/UI/Actions/Views/MailboxActionBar/MailboxActionBarView.swift # Modules/App/Sources/UI/Screens/ConversationDetail/Cells/ExpandedMessageViews/MessageDetailsView.swift # Modules/App/Sources/UI/Screens/ConversationDetail/ConversationDetailScreen.swift # Modules/App/Tests/Doubles/MailSessionSpy.swift # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithArchiveLocationNoLabelsLayoutsCorrectly.collapsed_dark.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithArchiveLocationNoLabelsLayoutsCorrectly.collapsed_light.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithArchiveLocationNoLabelsLayoutsCorrectly.expanded_dark.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithArchiveLocationNoLabelsLayoutsCorrectly.expanded_light.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithCustomLocationAndLabelsLayoutsCorrectly.collapsed_dark.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithCustomLocationAndLabelsLayoutsCorrectly.collapsed_light.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithCustomLocationAndLabelsLayoutsCorrectly.expanded_dark.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithCustomLocationAndLabelsLayoutsCorrectly.expanded_light.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithInboxLocationLayoutsCorrectly.collapsed_dark.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithInboxLocationLayoutsCorrectly.collapsed_light.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithInboxLocationLayoutsCorrectly.expanded_dark.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithInboxLocationLayoutsCorrectly.expanded_light.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithOutboxLocationLayoutsCorrectly.dark.png # Modules/App/Tests/Tests/Snapshots/Screens/ConversationDetails/__Snapshots__/MessageDetailsViewSnapshotTests/testMessageDetailsWithOutboxLocationLayoutsCorrectly.light.png # Modules/InboxContacts/Sources/Generated/Rust.generated.swift # ProtonPackages/et-protoncore # mail-sdk-version