Merge branch 'development' into linked-identities

Browse Source

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

...

This commit is contained in:

Vincent Breitmoser

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

parent c216346097 baac30508d

commit b4aec3114d

257 changed files with 7154 additions and 5101 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

OpenKeychain/src/main/res/drawable-hdpi/yubi_icon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/yubi_icon_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB