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/Session
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
..
Calls Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours 5 months ago
Closed Groups Updated NTS & 1-1 conversation deletion to be consistent with other plats 5 months ago
Conversations Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours 5 months ago
Dependencies Remove SwiftCSV 4 years ago
Emoji Refactored the LintLocalizableStrings script 7 months ago
Home Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours 5 months ago
Media Viewing & Editing Merge branch 'dev' into fix/rework-recipient-state 7 months ago
Meta Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours 5 months ago
Notifications Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours 5 months ago
Onboarding Fixed a crash which could occur when receiving a UserGroups config change 5 months ago
Open Groups Fixed a crash which could occur when receiving a UserGroups config change 5 months ago
Path Merge remote-tracking branch 'upstream/dev' into standardised-strings 9 months ago
Settings Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours 5 months ago
Shared Added logic for dev setting import/export 5 months ago
Utilities Fixed a crash which could occur when receiving a UserGroups config change 5 months ago
.swiftlint.yml Fix target naming 5 years ago