mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-28 20:45:17 +00:00
e937e2b354
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt # app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt # app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt |
||
---|---|---|
.. | ||
androidTest/java/org/session/content_descriptions | ||
main | ||
test/java/org/session/content_descriptions |