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/SessionUIKit
Morgan Pretty a6931bb922 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Shared/SessionTableViewController.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Types/SessionTableSection.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUIKit/Components/SessionButton.swift
2 years ago
..
Components Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Database/Migrations Added unit tests to verify migrations between all versions work 2 years ago
Meta
Style Guide Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Types Fixed an accessibility regression 3 years ago
Utilities Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
Configuration.swift Fixed an issue where the messages might not get reprocessed when they should 2 years ago