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 5e3dd3c731 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
#	Session/Shared/Views/SessionCell+AccessoryView.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUtilitiesKit/Database/Models/Job.swift
2 years ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 3 years ago
Calls Made a few optimisations and fixes 2 years ago
Closed Groups WIP: make group leaving a job 2 years ago
Conversations Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Dependencies Remove SwiftCSV 4 years ago
Emoji update emoji names for searching 3 years ago
Home clean 2 years ago
Media Viewing & Editing Merge branch 'dev' into message-and-image-info 2 years ago
Meta Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Notifications Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Onboarding Merge branch 'dev' into accessibility_ids_3 2 years ago
Open Groups Merge branch 'dev' into ipad-landscape-support 3 years ago
Path Fixed a couple of reachability oddities and bugs 2 years ago
Settings Merge branch 'dev' into disappearing-message-redesign 2 years ago
Shared Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Utilities Merge branch 'dev' into message-and-image-info 2 years ago
.swiftlint.yml