mirror of
https://github.com/oxen-io/session-android.git
synced 2025-01-11 17:33:39 +00:00
bc20811431
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt # app/src/main/res/values/strings.xml