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/LibSession/Config Handling
Morgan Pretty 2032dafc74 Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager
# Conflicts:
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionUtilitiesKit/Media/DataSource.h
#	SessionUtilitiesKit/Media/DataSource.m
9 months ago
..
LibSession+Contacts.swift Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 9 months ago
LibSession+ConvoInfoVolatile.swift Fixed build issues resulting from rebase after Onboarding 9 months ago
LibSession+Shared.swift Fixed build issues resulting from rebase after Onboarding 9 months ago
LibSession+UserGroups.swift Fixed the unit tests 9 months ago
LibSession+UserProfile.swift Updated to the latest libSession and updated it's error handling 11 months ago