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 77b6faccb3 Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionUtilitiesKit/Database/Models/Job.swift
#	SessionUtilitiesKit/Database/Models/JobDependencies.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
1 year ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 2 years ago
Calls Made a few optimisations and fixes 1 year ago
Closed Groups Updated the profile picture management UI 1 year ago
Conversations Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 1 year ago
Dependencies Remove SwiftCSV 3 years ago
Emoji update emoji names for searching 2 years ago
Home Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 1 year ago
Media Viewing & Editing Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 1 year ago
Meta Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 1 year ago
Notifications Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 1 year ago
Onboarding Updated the profile picture management UI 1 year ago
Open Groups Updated the profile picture management UI 1 year ago
Path Various tweaks and fixes 1 year ago
Settings Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 1 year ago
Shared Merge pull request #851 from mpretty-cyro/feature/updated-profile-picture-modal 1 year ago
Utilities Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 1 year ago
.swiftlint.yml