0x330a 9dfb6f84b7 Merge remote-tracking branch 'upstream/master' into closed_groups ... # Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt		2023-10-16 15:59:40 +11:00
..
src	Merge remote-tracking branch 'upstream/master' into closed_groups	2023-10-16 15:59:40 +11:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	Update session libsodium (#1326)	2023-10-04 15:17:27 +11:00