cthrace/open-keychain
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
This commit is contained in:
Vincent Breitmoser committed 2014-03-13 13:40:47 +01:00
2 parents 6af65a2a9b f5c50c3896
commit 9a1ce093bf
18 files changed
+149 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

OpenPGP-Keychain/src/main/res/menu/key_view.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<item
android:id="@+id/menu_key_view_share"
android:icon="@drawable/ic_action_share"
app:showAsAction="always"
app:showAsAction="ifRoom"
android:title="@string/menu_share">
<menu>
<item