SessionHero01 b2c9cc1d94 Merge remote-tracking branch 'origin/dev' into closed_groups ... # Conflicts: # .drone.jsonnet # app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModel.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.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/home/ConversationOptionsBottomSheet.kt # app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt # app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.kt # app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java # app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt # app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt # app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt # libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt		2024-09-11 14:24:48 +10:00
..
src	Merge remote-tracking branch 'origin/dev' into closed_groups	2024-09-11 14:24:48 +10:00
.gitignore	Strings work	2024-09-06 08:30:03 +10:00
build.gradle	Strings work	2024-09-06 08:30:03 +10:00
consumer-rules.pro	Strings work	2024-09-06 08:30:03 +10:00
proguard-rules.pro	Strings work	2024-09-06 08:30:03 +10:00