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/SessionMessagingKit/Threads
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
3 years ago
..
Notification+Thread.swift Further work on Id Blinding 3 years ago
TSContactThread.h Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 3 years ago
TSContactThread.m Merge branch 'dev' into feature/session-id-blinding-part-2 3 years ago
TSGroupModel.h Replaced the remaining non-file legacy methods with their non-legacy equivalents 3 years ago
TSGroupModel.m Replaced the remaining non-file legacy methods with their non-legacy equivalents 3 years ago
TSGroupThread.h minor refactor 3 years ago
TSGroupThread.m Replaced the remaining non-file legacy methods with their non-legacy equivalents 3 years ago
TSThread.h fix race condition for callkit 3 years ago
TSThread.m fix race condition for callkit 3 years ago