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

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
This commit is contained in:
Vincent Breitmoser
2015-04-09 13:57:56 +02:00
parent d27925ad19 dcaac4f85f
commit a4b7daf266
236 changed files with 10295 additions and 8379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -19,6 +19,11 @@
android:title="@string/menu_manage_keys"
app:showAsAction="never" />
<item
android:id="@+id/menu_key_list_update_all_keys"
android:title="@string/menu_update_all_keys"
app:showAsAction="never" />
<item
android:id="@+id/menu_key_list_debug_cons"
android:title="Debug / Consolidate"