You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/SignalUtilitiesKit
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
2 years ago
..
Database Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Media Viewing & Editing Merge branch 'remove-unused-code' into voice-calls-2 2 years ago
Messaging Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2 years ago
Meta Merge branch 'remove-unused-code' into voice-calls-2 2 years ago
Profile Pictures Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Screen Lock Re-organize files 4 years ago
Shared View Controllers Removed a bunch of unused code 2 years ago
Shared Views Removed a bunch of unused code 2 years ago
To Do Merge branch 'dev' into feature/session-id-blinding-part-2 2 years ago
Utilities add missed call notification 2 years ago
Configuration.swift Renamed FileServerAPIV2 to FileServerAPI 2 years ago