Morgan Pretty 1c575e520d Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 ... # Conflicts: # Podfile.lock # Session.xcodeproj/project.pbxproj # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/Views & Modals/JoinOpenGroupModal.swift # Session/Home/HomeVC.swift # Session/Open Groups/JoinOpenGroupVC.swift # Session/Utilities/BackgroundPoller.swift # SessionMessagingKit/Jobs/AttachmentUploadJob.swift # SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift # SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift # SessionNotificationServiceExtension/NotificationServiceExtension.swift		2022-04-26 13:06:12 +10:00
..
BlockedModal.swift	Merge branch 'remove-OWSBlockingManager' into voice-calls-2	2022-03-31 11:09:09 +11:00
BodyTextView.swift	Clean	2021-02-19 16:02:19 +11:00
CallModal.swift	refactoring on showing call ip exposure	2021-11-11 12:12:12 +11:00
CallPermissionRequestModal.swift	minor UI adjustment	2022-03-04 15:28:16 +11:00
ConversationTitleView.swift	Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2	2022-04-26 13:06:12 +10:00
DownloadAttachmentModal.swift	UI minor adjustment to modals	2022-03-04 15:23:02 +11:00
InfoBanner.swift	Clean	2021-02-19 16:02:19 +11:00
JoinOpenGroupModal.swift	Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2	2022-04-26 13:06:12 +10:00
LinkPreviewModal.swift	UI minor adjustment to modals	2022-03-04 15:23:02 +11:00
MessagesTableView.swift	Merge branch 'ipad-support-1' into voice-calls-2	2022-03-02 14:31:31 +11:00
PermissionMissingModal.swift	UI minor adjustment to modals	2022-03-04 15:23:02 +11:00
ScrollToBottomButton.swift	Minor refactoring	2021-07-01 16:15:04 +10:00
SendSeedModal.swift	UI minor adjustment to modals	2022-03-04 15:23:02 +11:00
URLModal.swift	UI minor adjustment to modals	2022-03-04 15:23:02 +11:00
UserDetailsSheet.swift	Make profile pictures tappable	2021-07-14 15:56:56 +10:00