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 5d88db7a8a Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCall.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Input View/MentionSelectionView.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Shared/Views/SessionAvatarCell.swift
#	Session/Shared/Views/SessionCell+AccessoryView.swift
#	SessionUIKit/Components/ConfirmationModal.swift
#	SessionUIKit/Components/PlaceholderIcon.swift
#	SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift
1 year ago
..
Database/Migrations Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 2 years ago
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 1 year ago
Meta Added in missing code changes unrelated to closed groups rebuild 2 years ago
Screen Lock Further config util logic 2 years ago
Shared View Controllers Updated to the latest libSession, fixed remaining items 1 year ago
Shared Views Removed some unneeded imports 2 years ago
Utilities Fixed a few bugs and build libSession-util from source 1 year ago
Configuration.swift Increased the file upload size to 10Mb 2 years ago