diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-10-20 19:45:26 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-10-20 19:45:26 +0200 |
| commit | 59e861ee6904296cbe8dd43c4a29513c2e928981 (patch) | |
| tree | a3bf768814ece1c377caefca35bc535c758a47c5 /src/main/java/eu/siacs/conversations/crypto/OtrService.java | |
| parent | 2860088f0ea1cd5753756861c71cc7c118094f32 (diff) | |
| parent | 9ec29bb1dcf664fea606105b7e700641a4b44ae4 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/OtrService.java')
0 files changed, 0 insertions, 0 deletions