mirror of
https://github.com/oxen-io/session-android.git
synced 2025-02-19 22:18:26 +00:00

# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt