Morgan Pretty 4f8fb63f2c Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling ... # Conflicts: # Session/Media Viewing & Editing/PhotoCapture.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/Onboarding/RestoreVC.swift # Session/Shared/SessionTableViewController.swift # Session/Shared/SessionTableViewModel.swift # SessionMessagingKit/Calls/WebRTCSession.swift # SessionMessagingKit/Database/Models/Attachment.swift # SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift # SessionMessagingKit/File Server/FileServerAPI.swift # SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift # SessionMessagingKit/Open Groups/OpenGroupAPI.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift # SessionMessagingKit/Sending & Receiving/MessageReceiver.swift # SessionMessagingKit/Sending & Receiving/MessageSender.swift # SessionSnodeKit/OnionRequestAPI.swift # SessionSnodeKit/SnodeAPI.swift # SessionUtilitiesKit/Database/Models/Identity.swift # SessionUtilitiesKit/JobRunner/JobRunner.swift		2023-01-27 14:26:17 +11: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/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
Closed Groups	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
Conversations	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +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	Sorted out a bunch of the config syncing logic	2022-12-16 16:51:08 +11:00
Media Viewing & Editing	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
Meta	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
Notifications	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
Onboarding	Fixed a few issues uncovered when testing the shared util feature flag	2023-01-05 13:40:33 +11:00
Open Groups	Fixed a few issues uncovered when testing the shared util feature flag	2023-01-05 13:40:33 +11:00
Path	Cleaned up the config-based table view controller to be more reusable	2022-09-28 17:30:31 +10:00
Settings	Sorted out a bunch of the config syncing logic	2022-12-16 16:51:08 +11:00
Shared	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
Utilities	Fixed the broken unit tests	2023-01-05 12:36:47 +11:00
.swiftlint.yml	Fix target naming	2020-11-11 18:42:06 +11:00