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
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
..
Combine Number of fixes and tweaks related to the deadlock issue 9 months ago
Crypto Replaced Cocoapods with Swift Package Manager for dependency management 9 months ago
Database Added Keychain migration code just in case (really shouldn't be needed) 9 months ago
General Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 9 months ago
JobRunner Replaced Cocoapods with Swift Package Manager for dependency management 9 months ago
LibSession Replaced Cocoapods with Swift Package Manager for dependency management 9 months ago
Media Replaced Cocoapods with Swift Package Manager for dependency management 9 months ago
Meta Replaced Cocoapods with Swift Package Manager for dependency management 9 months ago
Networking Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 9 months ago
Utilities Added Keychain migration code just in case (really shouldn't be needed) 9 months ago
Configuration.swift Reworked the libSession network to be instance based 1 year ago