aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-09 17:02:49 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-09 17:02:49 +0100
commite9af0d4ca70dc01e1e7815261c098cf58cfc2fde (patch)
tree8d9c6f334f22f5eba19dab187cac3963edcac7b0 /src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
parentad6fef063ba152d19c1a08590da7996051bcd836 (diff)
parent61f046a675978fa53b725e6da18ed27c9f312015 (diff)
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/PgpEngine.java')
0 files changed, 0 insertions, 0 deletions