You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/Session/Settings
Morgan Pretty a1e88329db Merge branch 'dev' into feature/theming
# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Message Cells/VisibleMessageCell.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/AppNotifications.swift
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift
3 years ago
..
Views Merge branch 'dev' into feature/theming 3 years ago
AppearanceViewController.swift Progressing on theming functionality 3 years ago
ConversationSettingsViewController.swift Updated the app settings screens 3 years ago
HelpViewModel.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
NotificationContentViewModel.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
NotificationSettingsViewModel.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
NotificationSoundViewModel.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
NukeDataModal.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
PrivacySettingsViewModel.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
QRCodeVC.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
SeedModal.swift Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated) 3 years ago
SettingsTableViewController.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
SettingsTableViewModel.swift Updated the colours to source from direct theme values (instead of individual) 3 years ago
SettingsVC.swift Updated the app settings screens 3 years ago
ShareLogsModal.swift Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 3 years ago