Vincent Breitmoser 1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities ...

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

2015-04-26 01:02:22 +02:00

7.4 KiB

Raw Blame History

View Raw