0x330a 6bb1ad2ca9

Merge remote-tracking branch 'upstream/dev' into libsession-integration ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt

2023-05-22 17:23:14 +10: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/dev' into libsession-integration

2023-05-22 17:23:14 +10:00

.gitignore

…

build.gradle

fix: remove hilt testing, add spy on app context storage field instead, update libsession-util to fixed sodium cmake branch

2023-04-19 10:43:24 +10:00

google-services.json

…

lint-baseline.xml

App's gradle config cleanup.

2020-11-26 12:41:59 +11:00

lint.xml

…