aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/utils/CryptoHelper.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-06 18:36:55 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-06 18:36:55 +0200
commit313f9db1ec68448bd7abb303922c8228ac9c128c (patch)
treef8dc6f0e8f549e40796c5923898ff2ef2582d1b3 /src/eu/siacs/conversations/utils/CryptoHelper.java
parent2b4d9e8b60bdec97cbeedf070188efd6380e2332 (diff)
parent705445cd77e42fb12911a208803eb7a980c38e8d (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/utils/CryptoHelper.java')
0 files changed, 0 insertions, 0 deletions