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 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
..
OWSMessageTimerView.h Progressing on theming functionality 3 years ago
OWSMessageTimerView.m Made a few optimisations and fixes 2 years ago
ProfilePictureVC.swift Fixed search performance, started styling in-conversaiton settings 3 years ago
ThreadDisappearingMessagesViewModel.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
ThreadSettingsViewModel.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago