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 65057fba21 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Meta/AppDelegate.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserProfile.swift
#	SessionMessagingKit/SessionUtil/Database/QueryInterfaceRequest+Utilities.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionUtilitiesKit/Database/Storage.swift
#	SessionUtilitiesKit/Utilities/Bencode.swift
#	SignalUtilitiesKit/Utilities/AppSetup.swift
2 years ago
..
Migrations [WIP] Refactored dependency access to be more generic 2 years ago
Models Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago
Types [WIP] Refactored dependency access to be more generic 2 years ago
Utilities Started adding logic and unit tests for group creation 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 feature/groups-rebuild 2 years ago
StorageError.swift Merge branch 'feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago