diff options
author | James Booth <boothj5@gmail.com> | 2015-05-17 22:28:12 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-05-17 22:28:12 +0100 |
commit | 34d9b2b272ca2c35ab40dd181f2ea5a52e1dbc68 (patch) | |
tree | 46ee6f99192baa7db7e87b6c5c0b598ab26763a2 /src/xmpp/roster.h | |
parent | 7f861b7743a580bfd052798a21ef494ec6770e48 (diff) | |
parent | adae6bb4a5dc2356ad208742cbe764765869733d (diff) | |
download | profani-tty-34d9b2b272ca2c35ab40dd181f2ea5a52e1dbc68.tar.gz |
Merge branch 'master' into openpgp
Diffstat (limited to 'src/xmpp/roster.h')
0 files changed, 0 insertions, 0 deletions