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

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java

2015-04-24 14:18:01 +02:00

..

src/test

Merge branch 'development' into linked-identities

2015-04-24 14:18:01 +02:00

build.gradle

Update gradle plugin, update gradle test plugin

2015-03-26 22:56:28 +01:00