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
..
control	Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update	2021-04-28 09:42:02 +10:00
signal	Clean	2021-04-26 11:23:09 +10:00
visible	Clean	2021-04-26 11:23:09 +10:00
Destination.kt	Merge remote-tracking branch 'upstream/dev' into open_groups_V2, working on compact poller implementation	2021-04-28 17:41:30 +10:00
Message.kt	Clean	2021-04-26 11:14:45 +10:00