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/Shared/Views
Morgan Pretty 0e1dea8f62 Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
# Conflicts:
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
3 years ago
..
SessionCell+AccessoryView.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
SessionCell.swift Fixed the QA issues and a few other bugs 3 years ago
SessionHeaderView.swift Added in missing code changes unrelated to closed groups rebuild 3 years ago
SessionHighlightingBackgroundLabel.swift Theming tweaks and bug fixes 3 years ago