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
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
..
Backups
Calls Merge branch 'dev' into disappearing-message-redesign 2 years ago
Closed Groups Moved some logic outside of DBWrite closures to prevent hangs 2 years ago
Conversations Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Dependencies
Emoji Further config util logic 2 years ago
Home Fixes for user config crashes 2 years ago
Media Viewing & Editing Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Meta Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Notifications Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Onboarding Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Open Groups Replaced the 'ZXingObjC' dependency with a native implementation for scanning QR Codes 2 years ago
Path Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
Settings Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
Shared Merge branch 'dev' into disappearing-message-redesign 2 years ago
Utilities Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 2 years ago
.swiftlint.yml