SessionHero01 1f9b00bc0a Merge remote-tracking branch 'origin/dev' into closed_groups ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt # libsession/src/main/java/org/session/libsession/utilities/ConfigFactoryProtocol.kt		2024-10-14 11:41:29 +11:00
..
src	Merge remote-tracking branch 'origin/dev' into closed_groups	2024-10-14 11:41:29 +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