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
..
2021-05-21 15:02:34 +10:00
2021-05-18 09:26:08 +10:00
2021-05-18 09:12:33 +10:00
2021-05-18 16:11:38 +10:00
2021-05-18 16:03:47 +10:00
2021-05-18 16:11:38 +10:00
2021-05-18 09:26:08 +10:00
2021-06-22 15:41:14 +10:00
2021-05-18 16:11:38 +10:00
2021-05-18 16:03:47 +10:00
2021-05-18 09:12:33 +10:00
2021-05-21 15:02:34 +10:00
2021-06-24 15:46:36 +10:00
2021-05-18 09:12:33 +10:00
2021-06-24 15:17:12 +10:00
2021-05-18 16:11:38 +10:00
2021-05-18 16:11:38 +10:00
2021-06-24 15:03:29 +10:00
2021-05-18 09:26:08 +10:00
2021-05-31 13:13:25 +10:00
2021-05-18 09:12:33 +10:00
2021-05-18 09:12:33 +10:00
2021-05-18 09:12:33 +10:00
2021-05-18 09:12:33 +10:00
2021-05-18 16:11:38 +10:00
2021-05-21 15:56:38 +10:00
2021-05-18 16:03:47 +10:00
2021-05-18 09:12:33 +10:00
2021-04-29 10:10:41 +10:00
2021-05-18 16:11:38 +10:00
2021-05-18 09:12:33 +10:00
2021-05-18 16:03:47 +10:00
2021-05-18 09:12:33 +10:00
2021-05-18 16:11:38 +10:00
2021-05-18 16:11:38 +10:00