mirror of
https://github.com/oxen-io/session-android.git
synced 2025-04-06 11:15:39 +00:00

# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.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/preferences/BlockedContactsViewModel.kt # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt