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 3e97782d18 Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt_BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
4 years ago
..
Common Networking Additional encryption work on id blinding 4 years ago
Contacts Built out the Message Request functionality 4 years ago
Database Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
File Server Additional encryption work on id blinding 4 years ago
Jobs Got the '/inbox' APIs and encryption/decryption/validation working 4 years ago
Messages Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
Meta Remove unused code 5 years ago
Open Groups Started working on `MessageRequestResponse` handling for SOGS message requests 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 Started working on `MessageRequestResponse` handling for SOGS message requests 4 years ago
Configuration.swift Redesign conversation screen part 1 5 years ago
Storage.swift Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago