diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-04-10 20:46:48 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-04-10 20:46:48 +0200 |
| commit | 851b335377a68eed651ca0ff57175ae5d4ae4014 (patch) | |
| tree | b91fd9fb66120565534751938ec0d215b42bb485 /src/main/java/de/pixart/messenger/crypto/OtrService.java | |
| parent | f71db4c46b1737d4f0c6feb4894f0eaa7a98dd16 (diff) | |
| parent | 7f7f9dabd2a9c27f9567709701f7cea6d0a52380 (diff) | |
Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger
Diffstat (limited to 'src/main/java/de/pixart/messenger/crypto/OtrService.java')
0 files changed, 0 insertions, 0 deletions