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

Merge remote-tracking branch 'origin/development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
This commit is contained in:
Vincent Breitmoser
2015-04-26 01:02:22 +02:00
parent d6d678dae3 c442d3bd0d
commit 1865852ccc
55 changed files with 1113 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/decrypt_result_include" />
<!--<include layout="@layout/decrypt_result_include" />-->
<LinearLayout
android:visibility="gone"