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
..
proguard	fix: Selected message theme colours and crash fixes (#1025)	2022-10-24 15:45:26 +11:00
src	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-03-31 13:41:41 +11:00
.gitignore
build.gradle	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-03-31 13:41:41 +11:00
google-services.json
lint-baseline.xml	App's gradle config cleanup.	2020-11-26 12:41:59 +11:00
lint.xml