diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-05-21 09:19:56 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-05-21 09:19:56 +0200 |
| commit | 9d1a8c607fbd8b784f2cfdc6817938e03b3de093 (patch) | |
| tree | 01e60da9e077f1502350b67ddada819309ea71ea /src/main/java/eu/siacs/conversations/crypto/OtrEngine.java | |
| parent | 75977818eadd07c6a0adcd41f9af137faaf86349 (diff) | |
| parent | d908b703405f63a10781514ae367569edb87e4c8 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/OtrEngine.java')
0 files changed, 0 insertions, 0 deletions