jubb fa528c47d5 Merge remote-tracking branch 'upstream/dev' into open_groups_V2 ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt # app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt # app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt # app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt # libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt # libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt # libsession/src/main/java/org/session/libsession/utilities/mentions/Mention.kt # libsignal/src/main/java/org/session/libsignal/service/loki/Mention.kt # libsignal/src/main/java/org/session/libsignal/service/loki/utilities/mentions/Mention.kt		2021-05-03 15:37:53 +10:00
..
protobuf	Match iOS protobuf	2021-04-26 11:06:00 +10:00
src	Merge remote-tracking branch 'upstream/dev' into open_groups_V2	2021-05-03 15:37:53 +10:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	clean logging	2021-02-03 12:22:40 +11:00
consumer-rules.pro	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
proguard-rules.pro	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00