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 63be502434 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Dictionary+Utilities.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
2 years ago
..
Calls Fixed the broken tests 2 years ago
Common Networking Added in missing code changes unrelated to closed groups rebuild 2 years ago
Database Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
File Server Fixed a number of issues found during internal testing 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 update legacy to be unknown 2 years ago
Sending & Receiving Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
SessionUtil Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Shared Models Merge branch 'dev' into disappearing-message-redesign 2 years ago
Utilities Fixed the broken tests 2 years ago
Configuration.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago