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/Conversations/Settings
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
11 months ago
..
OWSMessageTimerView.h Progressing on theming functionality 2 years ago
OWSMessageTimerView.m Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 1 year ago
ProfilePictureVC.swift Fixed search performance, started styling in-conversaiton settings 2 years ago
ThreadDisappearingMessagesSettingsViewModel.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 11 months ago
ThreadSettingsViewModel.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 11 months ago