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 6830c68c31 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session/Calls/Call Management/SessionCall.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/MainAppContext.swift
#	Session/Notifications/PushRegistrationManager.swift
#	SessionMessagingKit/Jobs/GarbageCollectionJob.swift
#	SessionMessagingKit/Jobs/Types/UpdateProfilePictureJob.swift
#	SessionMessagingKit/LibSession/Config Handling/LibSession+Shared.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Utilities/ProfileManager.swift
#	SessionUtilitiesKit/Database/Storage.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
#	_SharedTestUtilities/SynchronousStorage.swift
3 months ago
..
Calls Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 4 months ago
Crypto Some code clean up and bug fixes 7 months ago
Database Fixed a few more issues 3 months ago
Jobs Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
LibSession Database reentrancy fixes 3 months ago
Messages Fixed a number of QA issues and other bugs founds 3 months ago
Meta Refactored AppContext and AppRediness to Swift 1 year ago
Open Groups Fixed a number of QA issues and other bugs founds 3 months ago
Protos Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 7 months ago
Sending & Receiving Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
Shared Models Added the legacy group deprecation logic (pending final copy) 3 months ago
Utilities Fixed a few issues related to database reentrancy 3 months ago
Configuration.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 5 months ago