Morgan Pretty bc20811431 Merge remote-tracking branch 'upstream/dev' into feature/read_status_updates ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
#	app/src/main/res/values/strings.xml

2023-01-24 14:10:14 +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/dev' into feature/read_status_updates

2023-01-24 14:10:14 +11:00

.gitignore

…

build.gradle

Merge pull request #1069 from mpretty-cyro/feature/performance-improvements

2023-01-24 13:59:32 +11:00

google-services.json

…

lint-baseline.xml

App's gradle config cleanup.

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

lint.xml

…