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/SessionMessagingKit
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
..
Calls Added some more tests and cleaned up some warnings 2 years ago
Common Networking Added in missing code changes unrelated to closed groups rebuild 2 years ago
Database Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago
File Server Reworked SnodeAPI auth and prepared requests 2 years ago
Jobs/Types Clean up and fixed some broken tests 2 years ago
Messages Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago
Meta Theming tweaks and bug fixes 3 years ago
Open Groups Added some more tests and cleaned up some warnings 2 years ago
Protos Added some more tests and cleaned up some warnings 2 years ago
Sending & Receiving Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support 2 years ago
SessionUtil Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago
Shared Models Added some more tests and cleaned up some warnings 2 years ago
Utilities Added some more tests and cleaned up some warnings 2 years ago
Configuration.swift Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago