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 0002810c7f Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift
1 year ago
..
Calls Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Closed Groups Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Conversations Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Database/Migrations Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Emoji Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Home Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Media Viewing & Editing Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Meta Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Notifications Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Onboarding Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Open Groups Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Path Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Settings Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Shared Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Utilities Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
.swiftlint.yml