diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-11 17:45:16 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-11 17:45:16 +0100 |
| commit | 52ca2e7391acd6e34eb1dfc4c6f893bc154dec37 (patch) | |
| tree | 6085b390ee7f408f289c66c19eb541e478ea4d8f /libs/openpgp-keychain | |
| parent | d1bf9a3f6d63deaef28a1966e90c6ccd18275d30 (diff) | |
| parent | 8cb97f517fcd9bdb33f07edccf27b7497653c2de (diff) | |
Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification
Conflicts:
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
Diffstat (limited to 'libs/openpgp-keychain')
0 files changed, 0 insertions, 0 deletions