diff options
| author | James Booth <boothj5@gmail.com> | 2015-05-01 00:55:58 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-05-01 00:55:58 +0100 |
| commit | cade9e7c4c9781afceb4f79f6128d4a67dc4ce9b (patch) | |
| tree | fde4fbe7ffda6dcc7f3099d99602ec0955c4b8f0 /src/xmpp/capabilities.h | |
| parent | 0bd642edf8d943485871082c2678b0662e1dd5db (diff) | |
| parent | 01181780801a46ecc6996be5b75b2245c1c1b953 (diff) | |
| download | profani-tty-cade9e7c4c9781afceb4f79f6128d4a67dc4ce9b.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src/xmpp/capabilities.h')
0 files changed, 0 insertions, 0 deletions