diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-11-06 21:41:29 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-11-06 21:41:29 +0100 |
| commit | 6bc277152a8e1bcf5347d3e1d60c93dfc904ca23 (patch) | |
| tree | f8ff8a13090f774243d2744eaba0185877245a14 /src/main/java/eu/siacs/conversations/utils/DNSHelper.java | |
| parent | 0575767152abc391fd1d0241d9cbae154236df70 (diff) | |
| parent | 8838a5094812e0540ccfef3334e49e1a5c1a564b (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/DNSHelper.java')
0 files changed, 0 insertions, 0 deletions