Morgan Pretty 8109a326cf Merge remote-tracking branch 'upstream/dev' into feature/theming ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Closed Groups/NewClosedGroupVC.swift # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/Message Cells/CallMessageCell.swift # Session/Conversations/Views & Modals/JoinOpenGroupModal.swift # Session/Home/HomeVC.swift # Session/Home/New Conversation/NewDMVC.swift # Session/Home/NewConversationButtonSet.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/Open Groups/JoinOpenGroupVC.swift # Session/Open Groups/OpenGroupSuggestionGrid.swift # Session/Settings/SettingsVC.swift # Session/Shared/BaseVC.swift # Session/Shared/OWSQRCodeScanningViewController.m # Session/Shared/ScanQRCodeWrapperVC.swift # Session/Shared/UserCell.swift # SessionMessagingKit/Configuration.swift # SessionShareExtension/SAEScreenLockViewController.swift # SessionUIKit/Style Guide/Gradients.swift # SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift # SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m		2022-09-26 11:16:47 +10:00
..
Database/Migrations	Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor	2022-06-08 14:29:51 +10:00
Media Viewing & Editing	Merge remote-tracking branch 'upstream/dev' into feature/theming	2022-09-26 11:16:47 +10:00
Messaging	Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated)	2022-07-01 13:08:45 +10:00
Meta	Finished removing usages to non-theme colour variables	2022-09-20 16:06:01 +10:00
Profile Pictures	Merge remote-tracking branch 'upstream/dev' into feature/theming	2022-09-26 11:16:47 +10:00
Screen Lock	Finished removing usages to non-theme colour variables	2022-09-20 16:06:01 +10:00
Shared View Controllers	Merge remote-tracking branch 'upstream/dev' into feature/theming	2022-09-26 11:16:47 +10:00
Shared Views	Merge remote-tracking branch 'upstream/dev' into feature/theming	2022-09-26 11:16:47 +10:00
Utilities	Finished removing usages to non-theme colour variables	2022-09-20 16:06:01 +10:00
Configuration.swift	Finished removing usages to non-theme colour variables	2022-09-20 16:06:01 +10:00