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 committed 2015-03-24 15:29:58 +01:00

2 parents fe32e7bff4 8b4388e1a2

commit f9ef1160ca

136 files changed

+1910 -1282

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

No files matched your search

OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_grey_24dp.png

BIN

Binary file not shown.

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