jubb b5f41b4383 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
2021-06-24 16:26:45 +10:00
..
2020-11-26 12:41:59 +11:00