Merge remote-tracking branch 'origin/master' into v/multi-decrypt

Browse Source

...

This commit is contained in:

Vincent Breitmoser

2015-06-26 02:44:59 +02:00

parent a990044fd9 51d35c7a83

commit dce4503ac5

23 changed files with 461 additions and 198 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_stat_notify_24dp.png Normal file

Binary file not shown.

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