Vincent Breitmoser a4b7daf266 Merge branch 'development' into linked-identities ...

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

2015-04-09 13:57:56 +02:00

6.8 KiB

Raw Blame History

View Raw