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		2022-03-31 12:03:00 +11:00
..
Common Networking	Added more unit tests	2022-03-18 16:39:25 +11:00
Contacts	Merge branch 'dev' into feature/session-id-blinding-part-2	2022-03-31 12:03:00 +11:00
Database	Merge branch 'dev' into feature/session-id-blinding-part-2	2022-03-31 12:03:00 +11:00
File Server	Finalised the OpenGroupAPI and more tests	2022-03-15 15:19:23 +11:00
Jobs	Reverted a change to the type for the serverId of a TSAttachment (change didn't match the protobuf)	2022-03-21 11:08:21 +11:00
Messages	Merge branch 'dev' into feature/session-id-blinding-part-2	2022-03-31 12:03:00 +11:00
Meta	Removed the OWSBlockingManager replacing it with the config sync	2022-03-23 09:59:38 +11:00
Open Groups	Fixed the unit tests broken by the merge	2022-03-29 10:15:22 +11:00
Protos	Removed 'publicKey' from the MessageRequestResponse and updated logic to use 'message.sender' isntead	2022-02-11 10:47:27 +11:00
Sending & Receiving	Merge branch 'dev' into feature/session-id-blinding-part-2	2022-03-31 12:03:00 +11:00
Threads	Merge branch 'dev' into feature/session-id-blinding-part-2	2022-03-31 12:03:00 +11:00
To Do	Fully switch to the new contact API	2021-07-22 14:41:27 +10:00
Utilities	Merge branch 'dev' into feature/session-id-blinding-part-2	2022-03-31 12:03:00 +11:00
Configuration.swift	Redesign conversation screen part 1	2021-02-09 15:14:18 +11:00
IdentityManagerProtocol.swift	Added more unit tests for the OpenGroupManager	2022-03-17 12:05:04 +11:00
Storage.swift	Fixed missed framework complication errors from merge	2022-03-29 09:30:32 +11:00