0x330a 36df2b37df Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt # libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java		2023-07-25 13:14:29 +10:00
..
protobuf	fix: more merge conflict compile issues	2023-07-19 00:02:43 +10:00
src/main	Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages	2023-07-25 13:14:29 +10:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00