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 a6931bb922 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Shared/SessionTableViewController.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Types/SessionTableSection.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUIKit/Components/SessionButton.swift
2 years ago
..
LegacyDatabase Refactored the LintLocalizableStrings 2 years ago
Migrations Added unit tests to verify migrations between all versions work 2 years ago
Models Merge branch 'dev' into disappearing-message-redesign 2 years ago
Types Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Utilities Refactored the LintLocalizableStrings 2 years ago
OWSFileSystem.h Re-organize files 5 years ago
OWSFileSystem.m Refactored the LintLocalizableStrings 2 years ago
SSKKeychainStorage.swift Refactored the LintLocalizableStrings 2 years ago
Storage.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
StorageError.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 2 years ago