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/Meta
Morgan Pretty 5ac05a41ec Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Home/Message Requests/MessageRequestsViewModel.swift
#	Session/Meta/Translations/fil.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/sl.lproj/Localizable.strings
#	Session/Meta/Translations/sv-SE.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	Session/Settings/ConversationSettingsViewModel.swift
#	Session/Settings/HelpViewModel.swift
#	Session/Settings/NotificationContentViewModel.swift
#	Session/Settings/NotificationSettingsViewModel.swift
#	Session/Settings/NotificationSoundViewModel.swift
#	Session/Settings/PrivacySettingsViewModel.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Shared/SessionTableViewController.swift
#	SessionSnodeKit/Database/Models/SnodeReceivedMessageInfo.swift
#	SessionTests/Settings/NotificationContentViewModelSpec.swift
#	SessionUIKit/Components/TopBannerController.swift
#	SessionUtilitiesKit/Configuration.swift
2 years ago
..
AudioFiles
Certificates Updated the certificate for seed3 3 years ago
Countries
Fonts
Images.xcassets Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 3 years ago
Mnemonic
Settings.bundle Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support 2 years ago
Translations Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2 years ago
TurnServers
AppDelegate.swift Did some refactoring to better distinguish between publicKeys and sessionIds in the codebase 2 years ago
AppEnvironment.swift Fixed a few more PN logic issues 2 years ago
Launch Screen.storyboard
MainAppContext.swift Fixed build errors and cleaned up Dependencies interface further 2 years ago
Session-Info.plist clean 2 years ago
SessionApp.swift Did some refactoring to better distinguish between publicKeys and sessionIds in the codebase 2 years ago
Signal-Bridging-Header.h Merge branch 'dev' into disappearing-message-redesign 2 years ago
Signal.entitlements Removed the iCloud entitlements 3 years ago
SignalTSan.supp
SignalUBSan.supp