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

Resolve merge conflict with social-backup-poc

Browse Source
This commit is contained in:
ameba23
2021-10-06 11:32:11 +02:00
parent b9c614acfb 01fd193686
commit b2341e6392
33 changed files with 768 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/main/res/menu/conversation_actions.xml
View File

@@ -31,6 +31,7 @@
android:id="@+id/action_help_recover_account"
android:icon="@drawable/introduction_white"
android:title="@string/help_recover_account"
android:enabled="false"
app:showAsAction="never"/>
<item