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 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
..
Calls WIP: refactor on the call UI to add switching function of caller and callee's video views 2 years ago
Common Networking tweak: add update types of reaction to query parameter 3 years ago
Database Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
File Server Made a few optimisations and fixes 2 years ago
Jobs/Types Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Messages Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Meta Theming tweaks and bug fixes 3 years ago
Open Groups Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Protos clean up SyncedExpiries 2 years ago
Sending & Receiving Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Shared Models Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Utilities Made a few optimisations and fixes 2 years ago
Configuration.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago