diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-17 14:18:42 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-17 14:18:42 +0100 |
| commit | 5e4239a7b98a050b4312eee075f2fdac7f2b8af2 (patch) | |
| tree | 217082968f41a68c6635f9bed26e02f561cc41de /OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml | |
| parent | e8ad4317a49cc86ddd5e147fe18f82beb02f9717 (diff) | |
| parent | 87004fd0ca3a5178fba3050599a445ba9c64662c (diff) | |
| download | open-keychain-5e4239a7b98a050b4312eee075f2fdac7f2b8af2.tar.gz open-keychain-5e4239a7b98a050b4312eee075f2fdac7f2b8af2.tar.bz2 open-keychain-5e4239a7b98a050b4312eee075f2fdac7f2b8af2.zip | |
Merge branch 'certify' into certs
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
OpenPGP-Keychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml')
0 files changed, 0 insertions, 0 deletions