diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-05-16 22:49:52 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-05-16 22:49:52 +0200 |
| commit | 9b95b07b97c8c51bc0388059704a503e0b11a0d3 (patch) | |
| tree | 6226065050f9864a90fd4290f11652cf250a4c3e /src/eu/siacs/conversations/utils/CryptoHelper.java | |
| parent | e50f0090044ddbb11b83e6cc049c29a30f890878 (diff) | |
| parent | cd1afbd39aade757c592e756ff1a1d2df27f1442 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/utils/CryptoHelper.java')
0 files changed, 0 insertions, 0 deletions