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/Session
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
2 years ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 3 years ago
Calls Fixed a hang, removed redundant libs, files and code 2 years ago
Closed Groups Moved some logic outside of DBWrite closures to prevent hangs 2 years ago
Conversations CI tweaks and tweak for initial UX issue with 'blinded25' id 2 years ago
Dependencies
Emoji Further config util logic 2 years ago
Home Cleaning up final things before release 2 years ago
Media Viewing & Editing Updated the CI and fixed a couple of config bugs 2 years ago
Meta Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
Notifications Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
Onboarding Replaced the 'ZXingObjC' dependency with a native implementation for scanning QR Codes 2 years ago
Open Groups Replaced the 'ZXingObjC' dependency with a native implementation for scanning QR Codes 2 years ago
Path Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
Settings Replaced the 'ZXingObjC' dependency with a native implementation for scanning QR Codes 2 years ago
Shared Cleaning up final things before release 2 years ago
Utilities Cleaning up final things before release 2 years ago
.swiftlint.yml