diff options
author | James Booth <boothj5@gmail.com> | 2016-05-31 23:29:46 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2016-05-31 23:29:46 +0100 |
commit | 321541829617bce07526af318b7ff017e08eabf0 (patch) | |
tree | 468567373953c6258ee2f03f3f49c3542f364333 /src/xmpp/capabilities.h | |
parent | 1d5cc3327961739ac84ca3b9d66fc532bc6773b0 (diff) | |
parent | e758f74e48d447c622457e614f1f2f36b7ef7944 (diff) | |
download | profani-tty-321541829617bce07526af318b7ff017e08eabf0.tar.gz |
Merge branch 'master' into complete-empty
Diffstat (limited to 'src/xmpp/capabilities.h')
0 files changed, 0 insertions, 0 deletions