Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
ameba23
2021-03-16 10:52:11 +01:00
parent 505124a22f d91d2e0070
commit e9c2cb2cc5
9 changed files with 171 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/main/res/values/strings.xml
View File

@@ -716,4 +716,5 @@
<string name="social_backup_shard_received">You have received a social backup shard.</string>
<string name="social_backup_shard_sent">You have sent a social backup shard.</string>
<string name="activity_name_new_or_recover_account">Create new account or recover existing account</string>
</resources>