diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:26:45 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:26:45 +0200 |
| commit | 61149411c5141f2f9afe9b050ddce28c9d3df202 (patch) | |
| tree | 1407d6ca126bcd8244a83ee5bb76e5a7d581c5d2 /src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java | |
| parent | de7631e300eb9e578336d642dd279faecdb09391 (diff) | |
| parent | 9b59faa2fa0841fb5b3a153eae8cce09c3491a36 (diff) | |
Merge commit 'remotes/origin/trz/rename~4' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java')
0 files changed, 0 insertions, 0 deletions