mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
# Conflicts: # Session.xcodeproj/project.pbxproj # SessionMessagingKit/Configuration.swift # SessionMessagingKit/Database/Migrations/_012_AddClosedGroupInfo.swift # SessionMessagingKit/Database/Migrations/_013_AutoDownloadAttachments.swift # SessionMessagingKit/Open Groups/Models/SOGSBatchRequest.swift # SessionSnodeKit/OnionRequestAPI.swift # SessionSnodeKit/SSKDependencies.swift # SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift # SessionTests/Conversations/Settings/ThreadSettingsViewModelSpec.swift # SessionTests/Settings/NotificationContentViewModelSpec.swift # SessionUtilitiesKit/Networking/BatchResponse.swift |
||
---|---|---|
.. | ||
DependencyExtensions.swift | ||
Mockable.swift | ||
MockAeadXChaCha20Poly1305Ietf.swift | ||
MockBox.swift | ||
MockEd25519.swift | ||
MockGenericHash.swift | ||
MockNonce16Generator.swift | ||
MockNonce24Generator.swift | ||
MockOGMCache.swift | ||
MockSign.swift | ||
MockSodium.swift | ||
MockUserDefaults.swift | ||
OGMDependencyExtensions.swift | ||
TestOnionRequestAPI.swift |