Merge remote-tracking branch 'origin/development' into linked-identities

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml

...

This commit is contained in:

Vincent Breitmoser committed 2015-04-26 01:02:22 +02:00

2 parents d6d678dae3 c442d3bd0d

commit 1865852ccc

55 files changed

+1113 -238

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-xhdpi/ic_content_copy_black_24dp.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 304 B

OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 614 B