aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-04-18 19:26:45 +0200
committersteckbrief <steckbrief@chefmail.de>2016-04-18 19:26:45 +0200
commit61149411c5141f2f9afe9b050ddce28c9d3df202 (patch)
tree1407d6ca126bcd8244a83ee5bb76e5a7d581c5d2 /src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java
parentde7631e300eb9e578336d642dd279faecdb09391 (diff)
parent9b59faa2fa0841fb5b3a153eae8cce09c3491a36 (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