SessionHero01 677cd6a7cf Merge remote-tracking branch 'origin/dev' into closed_groups ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java # app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java # app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt # app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt		2024-10-03 14:37:08 +10:00
..
java/org	Merge remote-tracking branch 'origin/dev' into closed_groups	2024-10-03 14:37:08 +10:00
resources	[SES-2018] Refactor mention (#1510)	2024-07-01 17:31:03 +10:00