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/Open Groups/Models
Morgan Pretty 18ee9d34fa Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionMessagingKit/Open Groups/Types/SodiumProtocols.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionMessagingKitTests/_TestUtilities/MockAeadXChaCha20Poly1305Ietf.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
2 years ago
..
Capabilities.swift
DirectMessage.swift
PendingChange.swift
PinnedMessage.swift
ReactionResponse.swift
Room.swift
RoomPollInfo.swift
SOGSBatchRequest.swift
SOGSMessage.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 2 years ago
SendDirectMessageRequest.swift
SendDirectMessageResponse.swift
SendMessageRequest.swift
UpdateMessageRequest.swift
UserBanRequest.swift
UserModeratorRequest.swift
UserUnbanRequest.swift