diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-16 00:34:44 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-16 00:34:44 +0100 |
| commit | 2b21bc13fcd9bb942798bc8f05603a512c1ffa3a (patch) | |
| tree | 21f95dbf8214bbf68ce147874c415d4cda679c36 /src/main/java/eu/siacs/conversations/utils/XmppUri.java | |
| parent | 88c3537b6869996098da25954985fcb0c6971635 (diff) | |
| parent | ac4eabbd2257217eebddfc33840a618e78a97cad (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/XmppUri.java')
0 files changed, 0 insertions, 0 deletions