diff options
author | James Booth <boothj5@gmail.com> | 2014-11-20 22:37:14 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2014-11-20 22:37:14 +0000 |
commit | cdba79cbb56d6f564d4d0db3cf01296ef8aacaba (patch) | |
tree | 1afaddf35f81ad70cbe5a8f23ef3ea44d6070cba /src/xmpp/capabilities.h | |
parent | f24b34873961d82304383641a3e14421f442ce82 (diff) | |
parent | 5030d499529adb8827026aa2bc37d91c4b385597 (diff) | |
download | profani-tty-cdba79cbb56d6f564d4d0db3cf01296ef8aacaba.tar.gz |
Merge branch 'master' into autocomplete_fix
Diffstat (limited to 'src/xmpp/capabilities.h')
0 files changed, 0 insertions, 0 deletions