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 b471a32209 Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPI.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift
2 years ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 3 years ago
Calls Fixes for user config crashes 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 feature/job-runner-unit-tests 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 feature/job-runner-unit-tests 2 years ago
Meta Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
Notifications Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
Onboarding Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 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 feature/job-runner-unit-tests 2 years ago
Shared Fixes for user config crashes 2 years ago
Utilities Fixed the broken tests 2 years ago
.swiftlint.yml