oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity
session-ios/Session/Conversations/Settings
History
Morgan Pretty c3b855646f Merge branch 'dev' into feature/session-id-blinding-part-2 
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/SettingsVC.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
2022-03-31 12:03:00 +11:00
..
OWSConversationSettingsViewController.h Clean 2021-02-19 16:02:19 +11:00
OWSConversationSettingsViewController.m Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-31 12:03:00 +11:00
OWSConversationSettingsViewDelegate.h Clean 2021-02-19 16:02:19 +11:00
OWSMessageTimerView.h Clean 2021-02-19 16:02:19 +11:00
OWSMessageTimerView.m Clean 2021-02-19 16:02:19 +11:00
ProfilePictureVC.swift Update build number 2021-03-02 10:21:36 +11:00