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
..
src	Merge remote-tracking branch 'origin/dev' into closed_groups	2024-10-08 10:26:11 +11:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	Strings work	2024-09-06 11:21:03 +10:00