session-ios

mirror of https://github.com/lux-tel/session-ios.git synced 2026-10-30 20:38:32 +00:00

Files

T

History

Morgan Pretty 37e66498fd Merge branch 'master' into dev

# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/HomeVC.swift
#	Session/Notifications/NotificationPresenter.swift
#	Session/Onboarding/Onboarding.swift
#	Session/Utilities/UIContextualAction+Utilities.swift
#	SessionMessagingKit/Database/Models/ClosedGroup.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionMessagingKit/Utilities/ObservableKey+SessionMessagingKit.swift
#	SessionShareExtension/ThreadPickerVC.swift

2026-01-20 16:33:31 +11:00

Calls

Merge remote-tracking branch 'upstream/dev' into feature/libsession-message-wrapping

2025-12-17 09:36:05 +11:00

Closed Groups

Merge branch 'session-pro-settings' into feature/libsession-message-wrapping

2025-12-01 11:04:31 +11:00

Conversations

Merge branch 'master' into dev

2026-01-20 16:33:31 +11:00

Database/Convenience

Moved all migrations into one target, simplified migration logic