mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
5d88db7a8a
# Conflicts: # Session.xcodeproj/project.pbxproj # Session/Calls/Call Management/SessionCall.swift # Session/Conversations/ConversationVC.swift # Session/Conversations/Input View/MentionSelectionView.swift # Session/Conversations/Message Cells/VisibleMessageCell.swift # Session/Settings/SettingsViewModel.swift # Session/Shared/Views/SessionAvatarCell.swift # Session/Shared/Views/SessionCell+AccessoryView.swift # SessionUIKit/Components/ConfirmationModal.swift # SessionUIKit/Components/PlaceholderIcon.swift # SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift |
||
---|---|---|
.. | ||
Base.lproj | ||
Meta | ||
SAEScreenLockViewController.swift | ||
ShareAppExtensionContext.swift | ||
ShareNavController.swift | ||
SimplifiedConversationCell.swift | ||
ThreadPickerVC.swift | ||
ThreadPickerViewModel.swift |