Morgan Pretty 1bc6b0bdba Merge remote-tracking branch 'upstream/dev' into feature/theming ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/ConversationVC.swift # Session/Conversations/ConversationViewModel.swift # Session/Conversations/Message Cells/VisibleMessageCell.swift # Session/Home/HomeVC.swift # Session/Home/Message Requests/MessageRequestsViewController.swift # Session/Media Viewing & Editing/MediaTileViewController.swift # 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/Onboarding/LandingVC.swift # SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift		2022-09-15 14:22:11 +10:00
..
Components	Fixed search performance, started styling in-conversaiton settings	2022-09-07 17:37:01 +10:00
Database/Migrations	Applied theming to a number of screens, some minor cleanup and bug fixes	2022-08-12 17:28:00 +10:00
Meta	Create SessionUIKit	2020-11-09 16:03:59 +11:00
Style Guide	Merge remote-tracking branch 'upstream/dev' into feature/theming	2022-09-15 14:22:11 +10:00
Utilities	Updated the colours to source from direct theme values (instead of individual)	2022-08-24 17:33:10 +10:00
Configuration.swift	Progressing on theming functionality	2022-08-12 13:35:17 +10:00