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 ecd066f7a1 Merge remote-tracking branch 'upstream/dev' into strings
# Conflicts:
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Messages/Control Messages/CallMessage.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ThreadPickerVC.swift
7 months ago
..
Calls Fixed the share extension and moved the WebRTC logic 8 months ago
Crypto Fixed logging issue and other minor tweaks 7 months ago
Database Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
Jobs/Types Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
LibSession Fixed a regression when updating config messages 7 months ago
Messages Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
Meta Refactored AppContext and AppRediness to Swift 1 year ago
Open Groups Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
Protos Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 7 months ago
Sending & Receiving Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
Shared Models Merge remote-tracking branch 'upstream/dev' into standardised-strings 7 months ago
Utilities Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
Configuration.swift Additional bug fixes, log tweaks and update checking 10 months ago