session-android/app/src/main/java
0x330a ff057d7110 Merge remote-tracking branch 'upstream/dev' into closed_groups
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
#	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/MessageDetailActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt
#	app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt
#	app/src/main/res/drawable/profile_picture_view_large_background.xml
#	app/src/main/res/layout/dialog_download.xml
#	app/src/main/res/layout/view_untrusted_attachment.xml
#	app/src/main/res/values/strings.xml
#	app/src/test/java/org/thoughtcrime/securesms/util/OpenGroupMigrationTests.kt
#	libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt
#	libsession/src/main/java/org/session/libsession/utilities/bencode/Bencode.kt
#	libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
#	libsignal/src/main/java/org/session/libsignal/utilities/IdPrefix.kt
2023-08-23 16:45:24 +10:00
..
org/thoughtcrime/securesms Merge remote-tracking branch 'upstream/dev' into closed_groups 2023-08-23 16:45:24 +10:00