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/SessionMessagingKit
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
2 years ago
..
Calls Updated to the latest libSession, fixed remaining items 3 years ago
Common Networking Added in missing code changes unrelated to closed groups rebuild 3 years ago
Database Removed the extra debug logs for message sending 2 years ago
File Server Updated to the latest libSession, fixed remaining items 3 years ago
Jobs/Types Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling 2 years ago
Messages Fixed a few bugs uncovered with further testing 3 years ago
Meta Theming tweaks and bug fixes 3 years ago
Open Groups Fixed a few bugs uncovered with further testing 3 years ago
Protos Updated to the latest version of libSession-util 3 years ago
Sending & Receiving Fixed a few issues found during QA 2 years ago
SessionUtil Added a missing filter to a db query 2 years ago
Shared Models Fixed an issue where you couldn't search for hidden contacts 2 years ago
Utilities Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling 2 years ago
Configuration.swift Updated the feature flag so it will continue to use User Config if the migrations have already been run 3 years ago
SMKDependencies.swift Fixed the broken unit tests 3 years ago