diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-12-04 23:19:33 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-12-04 23:19:33 +0100 |
commit | 734511b0fa15fa6ceb88c6b0ab4791139f7ffc8d (patch) | |
tree | ae49823ebe987a260a7432292700a5918b26953e /src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java | |
parent | 9265d6718e83e2d8d29809cbec4f8fb1f3a29960 (diff) | |
parent | 0086d5dc80dd95b1e8e4dcfe2d3d3090d260bb88 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java')
0 files changed, 0 insertions, 0 deletions