diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-05-09 21:10:11 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-05-09 21:10:11 +0200 |
commit | 2860088f0ea1cd5753756861c71cc7c118094f32 (patch) | |
tree | 6c6463253b830390c07932a28058b18a5da21acd /src/main/java/eu/siacs/conversations/utils/DNSHelper.java | |
parent | be448291caf329896de4bff55da416001c173bb9 (diff) | |
parent | 10e607ac51dcc42fa1b54bacb698beed43750de7 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions