Morgan Pretty 1b0fda56ad Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Meta/AppDelegate.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/SyncPushTokensJob.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift # SessionShareExtension/ShareNavController.swift		2023-08-01 16:05:36 +10:00
..
Backups	Merge branch 'remove-unused-code' into voice-calls-2	2022-04-04 11:08:54 +10:00
Calls	Fixes for user config crashes	2023-07-20 12:29:56 +10:00
Closed Groups	Moved some logic outside of DBWrite closures to prevent hangs	2023-07-07 13:20:32 +10:00
Conversations	Fixes for user config crashes	2023-07-20 12:29:56 +10: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	Fixes for user config crashes	2023-07-20 12:29:56 +10:00
Media Viewing & Editing	Merge pull request #864 from f-person/feat/all-orientations-for-ipad	2023-07-25 16:54:54 +10:00
Meta	Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server	2023-08-01 16:05:36 +10:00
Notifications	Fixes for user config crashes	2023-07-20 12:29:56 +10:00
Onboarding	Fixes for user config crashes	2023-07-20 12:29:56 +10:00
Open Groups	Replaced the 'ZXingObjC' dependency with a native implementation for scanning QR Codes	2023-07-12 17:13:59 +10:00
Path	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-05-18 17:34:25 +10:00
Settings	Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server	2023-08-01 16:05:36 +10:00
Shared	Fixes for user config crashes	2023-07-20 12:29:56 +10:00
Utilities	Cleaning up final things before release	2023-07-14 14:36:59 +10:00
.swiftlint.yml	Fix target naming	2020-11-11 18:42:06 +11:00