diff options
| author | Marius Halden <marius.h@lden.org> | 2016-07-03 14:51:17 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-07-03 14:51:17 +0200 |
| commit | fd86ad18b56b77321d3e235594b6ae7e4f7acabd (patch) | |
| tree | 0df464fc3ea4930dd2b6d170526fb2ee5cb5bbd1 /protocols/jabber/jabber.h | |
| parent | 7a725c1a1f8fb0c8852d773403fcee341aebc763 (diff) | |
| parent | e83d450ef16d9a3783f5daff632c4ac57ceb8fec (diff) | |
Merge remote-tracking branch 'upstream/jgeboski/chatlist' into patched-master
Diffstat (limited to 'protocols/jabber/jabber.h')
0 files changed, 0 insertions, 0 deletions