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
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
2 years ago
..
Database/Migrations Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 3 years ago
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
Meta Added in missing code changes unrelated to closed groups rebuild 2 years ago
Profile Pictures Updated to the latest version of libSession-util 2 years ago
Screen Lock Further config util logic 2 years ago
Shared View Controllers Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
Shared Views Removed some unneeded imports 2 years ago
Utilities Sorted out a bunch of the config syncing logic 2 years ago
Configuration.swift Increased the file upload size to 10Mb 2 years ago