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

..

proguard

fix: Selected message theme colours and crash fixes (#1025)

2022-10-24 15:45:26 +11:00

src

Merge remote-tracking branch 'upstream/master' into closed_groups

2023-10-16 15:59:40 +11:00

.gitignore

…

build.gradle

Merge remote-tracking branch 'upstream/master' into closed_groups

2023-10-16 15:59:40 +11:00

google-services.json

…

lint-baseline.xml

…

lint.xml

…