diff options
| author | Marius Halden <marius.h@lden.org> | 2017-05-14 14:11:07 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2017-05-14 14:11:07 +0200 |
| commit | 52b77bf257ac24a69f596748c5c56af1f0cdac86 (patch) | |
| tree | 318d739b54968f15197a2bdd1aaca96179b1862a /protocols/jabber/jabber.c | |
| parent | 64f4d843217aed18605284f8c4ebba93724e5a63 (diff) | |
| parent | 54b2a367f6986a74fd6b4e50a0ae2c5cdb3a40cb (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols/jabber/jabber.c')
0 files changed, 0 insertions, 0 deletions