charles b3e9708649 Merge branch 'my-dev' into disappearing-messages ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

2022-11-17 11:26:20 +11:00

..

proguard

Play fixes (#1017)

2022-10-24 14:24:57 +11:00

src

Merge branch 'my-dev' into disappearing-messages

2022-11-17 11:26:20 +11:00

.gitignore

…

build.gradle

release: increment build number

2022-10-18 18:05:41 +11:00

google-services.json

…

lint-baseline.xml

App's gradle config cleanup.

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

lint.xml

…