diff options
| author | Christian S <christian@pix-art.de> | 2015-08-26 20:03:02 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-08-26 20:03:02 +0200 |
| commit | 85e35b3a75804203f226219abcfc86582892fb30 (patch) | |
| tree | ceb391c2b3f7cf098c0dff988e02dd4be941ac5d /src/main/java/eu/siacs/conversations/utils/DNSHelper.java | |
| parent | dfe58eaf341efe988f80faf5dc888900d28aa37a (diff) | |
| parent | 0f0054ef8629a285726a9190a297a43f91494af4 (diff) | |
Merge branch 'siacs-master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/DNSHelper.java')
0 files changed, 0 insertions, 0 deletions