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.xcodeproj
History
Morgan Pretty 07d1d8acee Merge branch 'dev' into feature/session-id-blinding-part-2 
# Conflicts:
#	Podfile
#	Podfile.lock
#	Session/Calls/Views & Modals/CallVideoView.swift
#	Session/Utilities/BackgroundPoller.swift
#	SessionSnodeKit/SnodeAPI.swift
2022-06-02 15:41:28 +10:00
..
project.xcworkspace Rename project 2021-01-11 15:01:59 +11:00
xcshareddata Merge remote-tracking branch 'upstream/voice-calls-2' into feature/session-id-blinding-part-2 2022-04-26 13:06:12 +10:00
project.pbxproj Merge branch 'dev' into feature/session-id-blinding-part-2 2022-06-02 15:41:28 +10:00