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 1b0fda56ad Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	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/Notifications/SyncPushTokensJob.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ShareNavController.swift
2 years ago
..
Views Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling 2 years ago
AppearanceViewController.swift Translations, better RTL support and minor animation fix 3 years ago
BlockedContactsViewModel.swift Sorted out a bunch of the config syncing logic 2 years ago
ConversationSettingsViewModel.swift Fixed a number of issues found during internal testing 2 years ago
HelpViewModel.swift Reworked the app startup process 2 years ago
ImagePickerHandler.swift Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling 2 years ago
NotificationContentViewModel.swift Fixed a number of issues found during internal testing 2 years ago
NotificationSettingsViewModel.swift Fixed a number of issues found during internal testing 2 years ago
NotificationSoundViewModel.swift Fixed a number of issues found during internal testing 2 years ago
NukeDataModal.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 2 years ago
PrivacySettingsViewModel.swift Fixed a number of issues found during internal testing 2 years ago
QRCodeVC.swift Replaced the 'ZXingObjC' dependency with a native implementation for scanning QR Codes 2 years ago
SeedModal.swift Fixes for user config crashes 2 years ago
SettingsViewModel.swift Fixes for user config crashes 2 years ago