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
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
..
Context Menu Merge branch 'dev' into message-and-image-info 2 years ago
Emoji Picker Finished removing usages to non-theme colour variables 3 years ago
Input View Merge branch 'dev' into accessibility_ids_3 2 years ago
Message Cells Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Settings Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Views & Modals Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
ConversationSearch.swift Fixed most of the styling issues raised during QA 3 years ago
ConversationVC+Interaction.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
ConversationVC.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
ConversationViewModel.swift Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago