diff options
author | Daniel Albert <albert_daniel@t-online.de> | 2014-07-13 15:39:16 +0200 |
---|---|---|
committer | Daniel Albert <albert_daniel@t-online.de> | 2014-07-13 15:39:16 +0200 |
commit | c101ee02400a5768abc3e98c996e7fe11e1b723c (patch) | |
tree | 356f131be3c8942d6e7ba771199b3b5deb281469 /OpenKeychain/src/main/res/layout/decrypt_activity.xml | |
parent | 92c66743e07b77da21af6236689a276eb23a9b1c (diff) | |
parent | 0ce9c131327ce754eb8c0c934ea59eecf005a26e (diff) | |
download | open-keychain-c101ee02400a5768abc3e98c996e7fe11e1b723c.tar.gz open-keychain-c101ee02400a5768abc3e98c996e7fe11e1b723c.tar.bz2 open-keychain-c101ee02400a5768abc3e98c996e7fe11e1b723c.zip |
Merge remote-tracking branch 'upstream/master' into feature-conceal-software
Diffstat (limited to 'OpenKeychain/src/main/res/layout/decrypt_activity.xml')
0 files changed, 0 insertions, 0 deletions