0x330a 7f7971e47f Merge remote-tracking branch 'upstream/dev' into disappearing-messages ...

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

2023-07-26 09:46:57 +10:00

..

proguard

Play fixes (#1017)

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

src

Merge remote-tracking branch 'upstream/dev' into disappearing-messages

2023-07-26 09:46:57 +10:00

.gitignore

…

build.gradle

Merge branch 'dev' into comp

2023-07-18 12:04:56 +09:30

google-services.json

…

lint-baseline.xml

…

lint.xml

…