Morgan Pretty 18b296bcd8 Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Meta/AppDelegate.swift # Session/Meta/Translations/de.lproj/Localizable.strings # Session/Meta/Translations/es-ES.lproj/Localizable.strings # Session/Meta/Translations/fi.lproj/Localizable.strings # Session/Meta/Translations/fr.lproj/Localizable.strings # Session/Meta/Translations/it.lproj/Localizable.strings # Session/Meta/Translations/ja.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/sk.lproj/Localizable.strings # Session/Meta/Translations/zh-CN.lproj/Localizable.strings # Session/Meta/Translations/zh-TW.lproj/Localizable.strings # SessionMessagingKit/Database/LegacyDatabase/SMKLegacy.swift # SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift # SessionMessagingKit/Messages/Control Messages/ConfigurationMessage.swift # SessionSnodeKit/Database/LegacyDatabase/SSKLegacy.swift # SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift # SessionUtilitiesKit/Database/LegacyDatabase/SUKLegacy.swift # SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift		2023-10-03 15:32:13 +11:00
..
Calls	Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign	2023-10-03 15:00:35 +11:00
Closed Groups	Fixed a few more PN logic issues	2023-08-10 14:43:40 +10:00
Conversations	update accessibility ids	2023-09-25 16:49:07 +10:00
Dependencies	Remove SwiftCSV	2021-01-27 14:09:19 +11:00
Emoji	Refactored the LintLocalizableStrings	2023-09-25 18:32:56 +10:00
Home	Cleaned up the GRDB interface for complex queries	2023-08-17 16:39:47 +10:00
Media Viewing & Editing	Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign	2023-09-26 09:02:04 +10:00
Meta	Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support	2023-10-03 15:32:13 +11:00
Notifications	Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign	2023-09-26 09:02:04 +10:00
Onboarding	Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support	2023-10-03 15:32:13 +11: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 disappearing-message-redesign	2023-10-03 15:00:35 +11:00
Shared	Merge branch 'dev' into disappearing-message-redesign	2023-08-14 11:08:04 +10:00
Utilities	Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign	2023-09-26 09:02:04 +10:00
.swiftlint.yml	Fix target naming	2020-11-11 18:42:06 +11:00