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/SessionUIKit
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
3 years ago
..
Components Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
Database/Migrations Fixed issues found during testing 3 years ago
Meta
Style Guide Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 3 years ago
Types Added in missing code changes unrelated to closed groups rebuild 3 years ago
Utilities Updated to the latest version of libSession-util 3 years ago
Configuration.swift Fixed build issues, bugs, added unit tests and added the ConvoInfoVolatile handling 3 years ago