session-android/app/src/main/java
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
..
org/thoughtcrime/securesms Merge branch 'dev' into trusted_attachment_download 2021-07-12 09:28:14 +10:00