mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
# 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 |
||
---|---|---|
.. | ||
xcbaselines/D221A0A9169C9E5F00537ABF.xcbaseline | ||
xcschemes | ||
IDETemplateMacros.plist |