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/SessionUtilitiesKit/Database
Morgan Pretty 63be502434 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Dictionary+Utilities.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
2 years ago
..
LegacyDatabase Added a restore account button to the failed migrations alert 3 years ago
Migrations Fixed build issues, bugs, added unit tests and added the ConvoInfoVolatile handling 2 years ago
Models Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Types CI tweaks and incremented build number 2 years ago
Utilities Fixed the broken tests 2 years ago
OWSFileSystem.h Re-organize files 4 years ago
OWSFileSystem.m Re-organize files 4 years ago
SSKKeychainStorage.swift Started work on GRDB logic and migrations 3 years ago
Storage.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
StorageError.swift Fixed a number of bugs found during internal testing 2 years ago