Morgan Pretty
|
e768bebe6d
|
Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Meta/Session-Prefix.pch
# Session/Notifications/SyncPushTokensJob.swift
# Session/Utilities/BackgroundPoller.swift
# SessionMessagingKit/Configuration.swift
# SessionMessagingKit/Database/Models/Profile.swift
# SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift
# SessionMessagingKit/Jobs/Types/AttachmentUploadJob.swift
# SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift
# SessionMessagingKit/Jobs/Types/FailedAttachmentDownloadsJob.swift
# SessionMessagingKit/Jobs/Types/FailedMessageSendsJob.swift
# SessionMessagingKit/Jobs/Types/GroupLeavingJob.swift
# SessionMessagingKit/Jobs/Types/MessageReceiveJob.swift
# SessionMessagingKit/Jobs/Types/MessageSendJob.swift
# SessionMessagingKit/Jobs/Types/NotifyPushServerJob.swift
# SessionMessagingKit/Jobs/Types/RetrieveDefaultOpenGroupRoomsJob.swift
# SessionMessagingKit/Jobs/Types/SendReadReceiptsJob.swift
# SessionMessagingKit/Jobs/Types/UpdateProfilePictureJob.swift
# SessionMessagingKit/Sending & Receiving/MessageSender.swift
# SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift
# SessionMessagingKit/Utilities/AppReadiness.m
# SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
# SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
# SessionShareExtension/ShareNavController.swift
# SessionSnodeKit/Jobs/GetSnodePoolJob.swift
# SessionUtilitiesKit/Configuration.swift
# SessionUtilitiesKit/Database/Utilities/Database+Utilities.swift
# SessionUtilitiesKit/JobRunner/JobRunner.swift
# SignalUtilitiesKit/Meta/SignalUtilitiesKit.h
# SignalUtilitiesKit/Utilities/SSKAsserts.h
|
2023-07-18 10:02:51 +10:00 |