session-ios/Session
Morgan Pretty 742c4a161f Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/GIFs/GiphyAPI.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt_BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Notifications/AppNotifications.swift
#	Session/Notifications/SyncPushTokensJob.swift
#	Session/Notifications/UserNotificationsAdaptee.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Database/Models/SessionThread.swift
#	SessionMessagingKit/Jobs/Types/MessageReceiveJob.swift
#	SessionMessagingKit/Jobs/Types/MessageSendJob.swift
#	SessionMessagingKit/Jobs/Types/SendReadReceiptsJob.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ReadReceipts.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Shared Models/MentionInfo.swift
2023-02-21 11:11:06 +11:00
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 2022-04-04 11:08:54 +10:00
Calls Updated to the latest version of libSession-util 2023-02-20 12:56:48 +11:00
Closed Groups Updated to the latest version of libSession-util 2023-02-20 12:56:48 +11:00
Conversations Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-02-21 11:11:06 +11:00
Dependencies Remove SwiftCSV 2021-01-27 14:09:19 +11:00
Emoji Further config util logic 2022-12-07 15:06:15 +11:00
Home Updated to the latest version of libSession-util 2023-02-20 12:56:48 +11:00
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-02-21 11:11:06 +11:00
Meta Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-02-21 11:11:06 +11:00
Notifications Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-02-21 11:11:06 +11:00
Onboarding Updated to the latest version of libSession-util 2023-02-20 12:56:48 +11:00
Open Groups Updated to the latest version of libSession-util 2023-02-20 12:56:48 +11:00
Path Fixed a couple of reachability oddities and bugs 2023-02-10 17:36:40 +11:00
Settings Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-02-21 11:11:06 +11:00
Shared Updated to the latest version of libSession-util 2023-02-20 12:56:48 +11:00
Utilities Updated to the latest version of libSession-util 2023-02-20 12:56:48 +11:00
.swiftlint.yml Fix target naming 2020-11-11 18:42:06 +11:00