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/Meta
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
..
AudioFiles add silence audio file 3 years ago
Certificates Updated the certificate for seed3 2 years ago
Countries Improve onion request path loading efficiency 4 years ago
Fonts Fix missing font 4 years ago
Images.xcassets Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 2 years ago
Mnemonic Debug 5 years ago
Settings.bundle Further refactoring work 2 years ago
Translations Fixed up the remaining reported internal testing issues 2 years ago
TurnServers add session turn server info 3 years ago
AppDelegate.swift Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
AppEnvironment.swift Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
Launch Screen.storyboard Updated the app settings screens 3 years ago
MainAppContext.h Fixed a few more threading-related bugs 2 years ago
MainAppContext.m Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
Session-Info.plist Changed the submodule to be via HTTPS instead of SSH 2 years ago
SessionApp.swift Moved some logic outside of DBWrite closures to prevent hangs 2 years ago
Signal-Bridging-Header.h Fixed a hang, removed redundant libs, files and code 2 years ago
Signal.entitlements Removed the iCloud entitlements 2 years ago
SignalTSan.supp
SignalUBSan.supp