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
..
Database	Merge branch 'dev' into feature/session-id-blinding-part-2	2022-04-04 13:33:27 +10:00
Media Viewing & Editing	Merge branch 'remove-unused-code' into voice-calls-2	2022-04-04 11:08:54 +10:00
Messaging	Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2	2022-04-26 13:06:12 +10:00
Meta	Merge branch 'remove-unused-code' into voice-calls-2	2022-04-04 11:08:54 +10:00
Profile Pictures	Merge branch 'dev' into feature/session-id-blinding-part-2	2022-03-11 17:15:55 +11:00
Screen Lock	Re-organize files	2021-01-12 11:25:31 +11:00
Shared View Controllers	Removed a bunch of unused code	2022-03-30 09:46:08 +11:00
Shared Views	Removed a bunch of unused code	2022-03-30 09:46:08 +11:00
To Do	Merge branch 'dev' into feature/session-id-blinding-part-2	2022-04-04 13:33:27 +10:00
Utilities	add missed call notification	2022-04-07 15:10:38 +10:00
Configuration.swift	Renamed FileServerAPIV2 to FileServerAPI	2022-03-04 16:17:03 +11:00