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/SignalUtilitiesKit/Shared View Controllers
Morgan Pretty 7d47a36f9f Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Shared/Views/SessionAvatarCell.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
1 year ago
..
ModalActivityIndicatorViewController.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 1 year ago
OWSViewController.h Re-organize files 4 years ago
OWSViewController.m Further config util logic 2 years ago