0x330a b6ff1deb64 Merge remote-tracking branch 'upstream/dev' into closed_groups ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # libsession-util/libsession-util # libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt # libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt # libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java # libsignal/protobuf/SignalService.proto # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java		2023-08-28 10:14:18 +10:00
..
src	Merge remote-tracking branch 'upstream/dev' into closed_groups	2023-08-28 10:14:18 +10:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	Move plugin to huawei flavor	2023-08-11 19:29:31 +09:30