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
..
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-14 11:41:29 +11:00
.gitignore
build.gradle	Merge remote-tracking branch 'origin/dev' into closed_groups	2024-10-14 11:41:29 +11:00
google-services.json
lint-baseline.xml
lint.xml