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 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
8 months ago
..
Components Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 8 months ago
Database/Migrations Fixed the broken unit tests 9 months ago
Meta
Style Guide Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 8 months ago
Types Fixed an accessibility regression 2 years ago
Utilities Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
Configuration.swift Fixed an issue where the messages might not get reprocessed when they should 2 years ago