diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-19 20:17:12 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-19 20:17:12 +0200 |
| commit | f824193c56308806c56b6ca526deb529941806a4 (patch) | |
| tree | 0cd7373a9356d8c841520be41a17c75ac9d4464d /src/eu/siacs/conversations/xmpp/jingle | |
| parent | 713cd6ef89e9abd6046a8c1d9be56a2c47518033 (diff) | |
| parent | c725da954c5b2c4a8dc7014f5468bc14ecb5a5f8 (diff) | |
Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lactide-srv_fix
Diffstat (limited to 'src/eu/siacs/conversations/xmpp/jingle')
0 files changed, 0 insertions, 0 deletions