lux-tel/session-ios
1
0
Fork 0
mirror of https://github.com/lux-tel/session-ios.git synced 2026-10-30 20:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
master
session-ios/SessionTests/Conversations
T
History
Morgan Pretty 315d60a641 Merge branch 'user-profile-modal' into session-pro-badge 
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Media Viewing & Editing/MessageInfoScreen.swift
#	Session/Meta/Translations/Localizable.xcstrings
#	Session/Settings/DeveloperSettings/DeveloperSettingsViewModel.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Shared/Views/SessionCell+AccessoryView.swift
#	Session/Shared/Views/SessionCell.swift
#	SessionUIKit/Components/Separator.swift
2025-09-19 14:44:24 +10:00
..
Settings
Merge branch 'user-profile-modal' into session-pro-badge
2025-09-19 14:44:24 +10:00