diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-29 23:10:31 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-29 23:10:31 +0200 |
| commit | 5021c1c194af85947c413f15e2ed8d28e4594b8a (patch) | |
| tree | 039b6e19caa18f7154345099bd1a2f186251f57c /src/main/java/eu/siacs/conversations/crypto | |
| parent | 074ff79fd9a6775157c5c4ed106ece86e0c912c2 (diff) | |
| parent | 75659ddc1216ca9fa76826a641a22f5167fc1f9b (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto')
0 files changed, 0 insertions, 0 deletions