Morgan Pretty 6c1b997e9b Merge branch 'feature/drop-yap-database-support' into feature/groups-rebuild ... # Conflicts: # Session.xcodeproj/project.pbxproj # SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift # SessionMessagingKit/Messages/Control Messages/ConfigurationMessage.swift # SessionUtilitiesKit/Database/Storage.swift		2023-08-21 16:30:11 +10:00
..
Backups	Merge branch 'remove-unused-code' into voice-calls-2	2022-04-04 11:08:54 +10:00
Calls	Merge branch 'dev' into disappearing-message-redesign	2023-08-14 11:08:04 +10:00
Closed Groups	Fixed a few more PN logic issues	2023-08-10 14:43:40 +10:00
Conversations	Merge branch 'dev' into disappearing-message-redesign	2023-08-14 11:08:04 +10:00
Dependencies	Remove SwiftCSV	2021-01-27 14:09:19 +11:00
Emoji	Fixed a few more PN logic issues	2023-08-10 14:43:40 +10:00
Home	Merge pull request #856 from mpretty-cyro/feature/updated-push-server	2023-08-11 18:02:20 +10:00
Media Viewing & Editing	Merge branch 'dev' into disappearing-message-redesign	2023-08-14 11:08:04 +10:00
Meta	Merge branch 'feature/drop-yap-database-support' into feature/groups-rebuild	2023-08-21 16:30:11 +10:00
Notifications	Merge branch 'dev' into disappearing-message-redesign	2023-08-14 11:08:04 +10:00
Onboarding	Merge branch 'feature/drop-yap-database-support' into feature/groups-rebuild	2023-08-21 16:30:11 +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 branch 'dev' into disappearing-message-redesign	2023-08-14 11:08:04 +10:00
Shared	Merge branch 'dev' into disappearing-message-redesign	2023-08-14 11:08:04 +10:00
Utilities	Merge branch 'dev' into disappearing-message-redesign	2023-08-14 11:08:04 +10:00
.swiftlint.yml	Fix target naming	2020-11-11 18:42:06 +11:00