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/SessionMessagingKit/Protos
Morgan Pretty 2032dafc74 Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager
# Conflicts:
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionUtilitiesKit/Media/DataSource.h
#	SessionUtilitiesKit/Media/DataSource.m
8 months ago
..
Generated Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 8 months ago
Makefile Re-implement message wrapping 4 years ago
SessionProtos.proto refactor and clean up on Expiration Timer Update messages 8 months ago
WebSocketResources.proto Re-implement message wrapping 4 years ago