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 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
1 year ago
..
SessionAvatarCell.swift Adding ids for the new read status 1 year ago
SessionCell+AccessoryView.swift Disabled the disappearing messages setting when not a group member 1 year ago
SessionCell.swift Merge branch 'dev' into disappearing-message-redesign 2 years ago
SessionFooterView.swift add footer title for group disappearing messages setting 2 years ago
SessionHeaderView.swift Cleaned up the config-based table view controller to be more reusable 2 years ago
SessionHighlightingBackgroundLabel.swift Theming tweaks and bug fixes 2 years ago