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
Morgan Pretty c3b855646f Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/SettingsVC.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
4 years ago
..
Common Networking Added more unit tests 4 years ago
Contacts Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
Database Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
File Server Finalised the OpenGroupAPI and more tests 4 years ago
Jobs Reverted a change to the type for the serverId of a TSAttachment (change didn't match the protobuf) 4 years ago
Messages Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
Meta Removed the OWSBlockingManager replacing it with the config sync 4 years ago
Open Groups Fixed the unit tests broken by the merge 4 years ago
Protos Removed 'publicKey' from the MessageRequestResponse and updated logic to use 'message.sender' isntead 4 years ago
Sending & Receiving Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
Threads Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
To Do Fully switch to the new contact API 4 years ago
Utilities Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
Configuration.swift Redesign conversation screen part 1 5 years ago
IdentityManagerProtocol.swift Added more unit tests for the OpenGroupManager 4 years ago
Storage.swift Fixed missed framework complication errors from merge 4 years ago