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 63be502434 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Dictionary+Utilities.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
2 years ago
..
AudioFiles add silence audio file 3 years ago
Certificates Updated the certificate for seed3 2 years ago
Countries Improve onion request path loading efficiency 4 years ago
Fonts Fix missing font 4 years ago
Images.xcassets Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 2 years ago
Mnemonic
Settings.bundle Further refactoring work 2 years ago
Translations Merge branch 'dev' into disappearing-message-redesign 2 years ago
TurnServers add session turn server info 3 years ago
AppDelegate.swift Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
AppEnvironment.swift Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
Launch Screen.storyboard Updated the app settings screens 3 years ago
MainAppContext.h Fixed a few more threading-related bugs 2 years ago
MainAppContext.m Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
Session-Info.plist Merge branch 'dev' into disappearing-message-redesign 2 years ago
SessionApp.swift Moved some logic outside of DBWrite closures to prevent hangs 2 years ago
Signal-Bridging-Header.h Merge branch 'updated-user-config-handling' into disappearing-message-redesign 2 years ago
Signal.entitlements Removed the iCloud entitlements 2 years ago
SignalTSan.supp
SignalUBSan.supp