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
Morgan Pretty f262b6d7a8 Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCallManager.swift
#	Session/Notifications/PushRegistrationManager.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift
5 months ago
..
Config Handling Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours 5 months ago
Database Various dependency changes required to get unit tests working correctly 5 months ago
Types Fixed a crash which could occur when receiving a UserGroups config change 5 months ago
LibSession+SessionMessagingKit.swift Various dependency changes required to get unit tests working correctly 5 months ago