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/SessionUIKit
Morgan Pretty abda057702 Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild
# Conflicts:
#	Scripts/LintLocalizableStrings.swift
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Views & Modals/IncomingCallBanner.swift
#	Session/Meta/AppDelegate.swift
#	Session/Onboarding/Onboarding.swift
#	Session/Onboarding/SeedVC.swift
#	SessionMessagingKit/Database/Migrations/_017_DisappearingMessagesConfiguration.swift
#	SessionMessagingKit/Messages/Control Messages/LegacyConfigurationMessage.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Shared.swift
#	SessionMessagingKit/SessionUtil/SessionUtil.swift
#	SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionUtilitiesKit/Database/Storage.swift
#	SessionUtilitiesKit/Database/Types/Migration.swift
#	SessionUtilitiesKit/Database/Types/PagedDatabaseObserver.swift
#	_SharedTestUtilities/SynchronousStorage.swift
2 years ago
..
Components Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2 years ago
Database/Migrations Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago
Meta Create SessionUIKit 5 years ago
Style Guide Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago
Types Fixed an accessibility regression 2 years ago
Utilities Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
Configuration.swift Added unit tests to verify migrations between all versions work 2 years ago