TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 18:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'loki/dev' into action-bar-back-buttons

Browse Source
This commit is contained in:
Anton Chekulaev
2020-09-18 12:52:48 +10:00
parent 6d1d1b527e 5fa7873f78
commit c2299beaf6
38 changed files with 833 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1866,4 +1866,6 @@
<string name="attachment_type_voice_message">Voice Message</string>
<string name="details">Details</string>
<string name="dialog_backup_activation_failed">Failed to activate backups. Please try again or contact support.</string>
</resources>