oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
session-ios/Session
History
Morgan Pretty 1c575e520d Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 
# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Home/HomeVC.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Jobs/AttachmentUploadJob.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
 		2022-04-26 13:06:12 +10:00
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 2022-04-04 11:08:54 +10:00
Calls Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
Closed Groups Merge branch 'dev' into feature/session-id-blinding-part-2 2022-03-31 12:03:00 +11:00
Conversations Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
DMs fix session id label width 2022-03-03 14:31:18 +11:00
Dependencies Remove SwiftCSV 2021-01-27 14:09:19 +11:00
Home Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
Media Viewing & Editing Merge branch 'bug-fixes-1.11.25' into voice-calls-2 2022-04-05 11:36:56 +10:00
Meta Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
Notifications try to fix a call issue when iOS is on lock screen 2022-04-11 10:36:21 +10:00
Onboarding Merge branch 'dev' into ipad-support-1 2022-03-08 14:03:37 +11:00
Open Groups Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
Path fix session id label width 2022-03-03 14:31:18 +11:00
Settings Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
Shared Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
Sheets & Modals slim the button width again 2022-03-03 13:35:27 +11:00
Utilities Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
.swiftlint.yml Fix target naming 2020-11-11 18:42:06 +11:00