diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-15 18:34:20 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-15 18:34:20 +0100 |
| commit | 6bacb5ff51f2c284fdc931cb5e82f8310035d8dc (patch) | |
| tree | e968dc6404974aa321bfc77e7b7e974c9c0f467f /OpenPGP-Keychain-API/example-app/src | |
| parent | a73e91c49c96f950bcd1892a738558cbbb523741 (diff) | |
| parent | 8fbd77fb15fda5d8984d6e39c1ebbce9696b0ae5 (diff) | |
| download | open-keychain-6bacb5ff51f2c284fdc931cb5e82f8310035d8dc.tar.gz open-keychain-6bacb5ff51f2c284fdc931cb5e82f8310035d8dc.tar.bz2 open-keychain-6bacb5ff51f2c284fdc931cb5e82f8310035d8dc.zip | |
Merge branch 'certify' into certs
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
OpenPGP-Keychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenPGP-Keychain-API/example-app/src')
0 files changed, 0 insertions, 0 deletions