diff options
author | James Booth <boothj5@gmail.com> | 2015-03-14 16:45:44 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-03-14 16:45:44 +0000 |
commit | a79ea3cbe239f6ce9db37896b2251c1b25143b7d (patch) | |
tree | 77ea854ee1e3c17d10dd92e1815c3a936aea1000 /src/xmpp/capabilities.h | |
parent | 060dcc24e313674ec8aa353e3e203e73216eb65a (diff) | |
parent | ede3368f7ad0f66928cdf506f3c51ffe64653a89 (diff) | |
download | profani-tty-a79ea3cbe239f6ce9db37896b2251c1b25143b7d.tar.gz |
Merge branch 'master' into xep-0184
Diffstat (limited to 'src/xmpp/capabilities.h')
0 files changed, 0 insertions, 0 deletions