jubb 842cfc25a1 Merge branch 'dev' into trusted_attachment_download ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

2021-07-12 09:28:14 +10:00

..

src

Merge branch 'dev' into trusted_attachment_download

2021-07-12 09:28:14 +10:00

.gitignore

restructure and unite service android/java to libsignal

2020-11-26 09:46:52 +11:00

build.gradle

fix: audio waveforms decoded on the attachment download

2021-07-01 17:06:42 +10:00