Morgan Pretty f4d6babca2 Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling ... # Conflicts: # Podfile.lock # Session.xcodeproj/project.pbxproj # Session/Closed Groups/EditClosedGroupVC.swift # Session/Conversations/Settings/ThreadSettingsViewModel.swift # Session/Home/HomeVC.swift # Session/Home/HomeViewModel.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/Shared/FullConversationCell.swift # SessionMessagingKit/Configuration.swift # SessionMessagingKit/Database/Models/SessionThread.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift # SessionMessagingKit/Shared Models/SessionThreadViewModel.swift # SessionUIKit/Utilities/UIContextualAction+Theming.swift # SessionUtilitiesKit/Database/Models/Job.swift # SessionUtilitiesKit/General/Dictionary+Utilities.swift # SessionUtilitiesKit/JobRunner/JobRunner.swift		2023-04-06 18:09:26 +10:00
..
Calls	Finished off a few remaining bits and pieces	2023-03-08 17:27:07 +11:00
Common Networking	Added in missing code changes unrelated to closed groups rebuild	2022-12-08 14:21:38 +11:00
Database	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-06 18:09:26 +10:00
File Server	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-02-21 11:11:06 +11:00
Jobs/Types	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-06 18:09:26 +10:00
LibSessionUtil	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-06 18:09:26 +10:00
Messages	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-06 18:09:26 +10:00
Meta	Theming tweaks and bug fixes	2022-10-14 17:09:38 +11:00
Open Groups	Removed usages of Box.KeyPair, removed a TODO	2023-03-10 09:42:36 +11:00
Protos	Updated to the latest version of libSession-util	2023-02-20 12:56:48 +11:00
Sending & Receiving	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-06 18:09:26 +10:00
Shared Models	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-06 18:09:26 +10:00
Utilities	Fixed the QA issues and a few other bugs	2023-03-31 12:09:04 +11:00
Configuration.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-06 18:09:26 +10:00
SMKDependencies.swift	Fixed the broken unit tests	2023-01-05 12:36:47 +11:00