SessionHero01 e937e2b354 Merge remote-tracking branch 'origin/dev' into closed_groups ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt # app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt # app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt		2024-10-08 10:26:11 +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 'origin/dev' into closed_groups	2024-10-08 10:26:11 +11:00
.gitignore
build.gradle	Merge remote-tracking branch 'origin/dev' into closed_groups	2024-10-08 10:26:11 +11:00
google-services.json
lint-baseline.xml
lint.xml