0x330a d5e4e6b7cd Merge remote-tracking branch 'upstream/dev' into libsession-integration ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt # libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt		2023-03-31 13:41:41 +11:00
..
protobuf	feat: add in more config factory for volatile	2023-02-06 14:28:00 +11:00
src/main	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-03-31 13:41:41 +11: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