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

..

android-icon-copier

if needed change name options.templ.json

2015-03-03 12:30:56 -08:00

drawables

Merge branch 'development' into linked-identities

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

screenshots

Screenshots

2015-02-20 11:13:40 +01:00

get-material-icons.sh

Add additional email addresses in create key

2015-03-10 01:44:07 +01:00

update-drawables.sh

Merge branch 'development' into linked-identities

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