Merge branch 'development' into linked-identities

Browse Source

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

...

This commit is contained in:

Vincent Breitmoser

2015-03-24 15:29:02 +01:00

parent fe32e7bff4 8b4388e1a2

commit f9ef1160ca

136 changed files with 1910 additions and 1282 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/ic_nfc_grey_24dp.png Normal file

Binary file not shown.

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