diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 09:46:42 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 09:46:42 +0100 |
| commit | e8780b4410c4e4a45f08b4002722b32f0d22d279 (patch) | |
| tree | 431846d5aba6b86a7a7ed3afd99976b9201dd471 /OpenKeychain/src/main/res/raw-et/help_wot.html | |
| parent | fd29d27e61e531378f0c37c78028fb2e86989dea (diff) | |
| parent | e77f9a535119f25b0f3ad31ef8065db18ceddff7 (diff) | |
| download | open-keychain-e8780b4410c4e4a45f08b4002722b32f0d22d279.tar.gz open-keychain-e8780b4410c4e4a45f08b4002722b32f0d22d279.tar.bz2 open-keychain-e8780b4410c4e4a45f08b4002722b32f0d22d279.zip | |
Merge branch 'development' into detached-sigs-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-et/help_wot.html')
0 files changed, 0 insertions, 0 deletions